Accepting request 705659 from home:Guillaume_G:branches:science:machinelearning

- Enable and fix Caffe parser
- Use %cmake_build macro

OBS-URL: https://build.opensuse.org/request/show/705659
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/armnn?expand=0&rev=2

armnn.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 27 05:42:06 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Enable and fix Caffe parser
+- Use %cmake_build macro
+
 -------------------------------------------------------------------
 Fri Apr 19 10:11:29 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 

armnn.spec

@@ -34,8 +34,8 @@
 %bcond_with armnn_flatbuffers
 %endif
 
-# Disable CAFFE for now (build broken)
+# Enable CAFFE
-%bcond_with armnn_caffe
+%bcond_without armnn_caffe
 
 # Disable TensorFlow for now (build broken)
 %bcond_with armnn_tf
@@ -108,6 +108,9 @@ Requires:       lib%{name}%{version_major} = %{version}
 %if %{with armnn_flatbuffers}
 Requires:       libarmnnSerializer%{version_major} = %{version}
 %endif
+%if %{with armnn_caffe}
+Requires:       libarmnnCaffeParser%{version_major} = %{version}
+%endif
 
 %description devel
 Arm NN is an inference engine for CPUs, GPUs and NPUs. 
@@ -144,7 +147,21 @@ such as TensorFlow and Caffe, allowing them to run efficiently – without
 modification – across Arm Cortex CPUs and Arm Mali GPUs.
 
 This package contains the libarmnnSerializer library from armnn.
+%endif
 
+%if %{with armnn_caffe}
+%package -n libarmnnCaffeParser%{version_major}
+Summary:        libarmnnCaffeParser from armnn
+Group:          Development/Libraries/C and C++
+
+%description -n libarmnnCaffeParser%{version_major}
+Arm NN is an inference engine for CPUs, GPUs and NPUs. 
+It bridges the gap between existing NN frameworks and the underlying IP. 
+It enables efficient translation of existing neural network frameworks, 
+such as TensorFlow and Caffe, allowing them to run efficiently – without 
+modification – across Arm Cortex CPUs and Arm Mali GPUs.
+
+This package contains the libarmnnCaffeParser library from armnn.
 %endif
 
 %prep
@@ -271,6 +288,10 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
 %license LICENSE
 %if %{with armnn_tests}
 %{_bindir}/ExecuteNetwork
+%if %{with armnn_caffe}
+%{_bindir}/Caffe*-Armnn
+%{_bindir}/MultipleNetworksCifar10
+%endif
 %endif
 %if %{with armnn_flatbuffers}
 %{_bindir}/SimpleSample
@@ -284,6 +305,11 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
 /usr/lib/libarmnnSerializer.so.*
 %endif
 
+%if %{with armnn_caffe}
+%files -n libarmnnCaffeParser%{version_major}
+/usr/lib/libarmnnCaffeParser.so.*
+%endif
+
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/armnn/
@@ -304,5 +330,9 @@ LD_LIBRARY_PATH="$(pwd)/build/" \
 %if %{with armnn_flatbuffers}
 /usr/lib/libarmnnSerializer.so
 %endif
+%if %{with armnn_caffe}
+/usr/lib/libarmnnCaffeParser.so
+%endif
+
 
 %changelog