bytedeco · n-kai-cj · Dec 8, 2020 · Dec 9, 2020
diff --git a/cppbuild.sh b/cppbuild.sh
@@ -45,6 +45,7 @@ case $ARCH in
 esac
 PLATFORM=$OS-$ARCH
 EXTENSION=
+EXCLUDE=
 echo "Detected platform \"$PLATFORM\""
 
 while [[ $# > 0 ]]; do
@@ -63,6 +64,13 @@ while [[ $# > 0 ]]; do
             shift
             EXTENSION="$1"
             ;;
+        -exclude=*)
+            EXCLUDE="${1#-exclude=}"
+            ;;
+        -exclude)
+            shift
+            EXCLUDE="$1"
+            ;;
         install)
             OPERATION=install
             ;;

diff --git a/opencv/cppbuild.sh b/opencv/cppbuild.sh
@@ -45,7 +45,10 @@ export PYTHON3_INCLUDE_DIR=
 export PYTHON3_LIBRARY=
 export PYTHON3_PACKAGES_PATH=
 if [[ -f "$CPYTHON_PATH/include/python3.7m/Python.h" ]]; then
-    export LD_LIBRARY_PATH="$OPENBLAS_PATH/lib/:$CPYTHON_PATH/lib/:$NUMPY_PATH/lib/:${LD_LIBRARY_PATH:-}"
+    export LD_LIBRARY_PATH="$CPYTHON_PATH/lib/:$NUMPY_PATH/lib/:${LD_LIBRARY_PATH:-}"
+    if [[ "$EXCLUDE" != *openblas ]]; then
+        export LD_LIBRARY_PATH="$OPENBLAS_PATH/lib/:${LD_LIBRARY_PATH:-}"
+    fi
     export PYTHON3_EXECUTABLE="$CPYTHON_PATH/bin/python3.7"
     export PYTHON3_INCLUDE_DIR="$CPYTHON_PATH/include/python3.7m/"
     export PYTHON3_LIBRARY="$CPYTHON_PATH/lib/python3.7/"
@@ -55,7 +58,10 @@ elif [[ -f "$CPYTHON_PATH/include/Python.h" ]]; then
     CPYTHON_PATH=$(cygpath $CPYTHON_PATH)
     OPENBLAS_PATH=$(cygpath $OPENBLAS_PATH)
     NUMPY_PATH=$(cygpath $NUMPY_PATH)
-    export PATH="$OPENBLAS_PATH:$CPYTHON_PATH:$NUMPY_PATH:$PATH"
+    export PATH="$CPYTHON_PATH:$NUMPY_PATH:$PATH"
+    if [[ "$EXCLUDE" != *openblas ]]; then
+        export PATH="$OPENBLAS_PATH:$PATH"
+    fi
     export PYTHON3_EXECUTABLE="$CPYTHON_PATH/bin/python.exe"
     export PYTHON3_INCLUDE_DIR="$CPYTHON_PATH/include/"
     export PYTHON3_LIBRARY="$CPYTHON_PATH/libs/python37.lib"
@@ -125,6 +131,14 @@ if [[ "$EXTENSION" == *gpu ]]; then
     GPU_FLAGS="-DWITH_CUDA=ON -DWITH_CUDNN=ON -DOPENCV_DNN_CUDA=ON -DCUDA_VERSION=11.0 -DCUDNN_VERSION=8.0 -DCUDA_ARCH_BIN='3.5' -DCUDA_ARCH_PTX='3.5' -DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr -DCUDA_nppicom_LIBRARY="
 fi
 
+# exclude openblas dependencies
+if [[ "$EXCLUDE" == *openblas ]]; then
+    export OpenBLAS_HOME=""
+    cd ../../../
+    patch -s -p0 < ./opencv_exclude-openblas.patch
+    cd cppbuild/"$PLATFORM$EXTENSION"/opencv-$OPENCV_VERSION
+fi
+
 case $PLATFORM in
     android-arm)
         $CMAKE -DCMAKE_TOOLCHAIN_FILE=platforms/android/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DANDROID_STL=c++_static -DANDROID_NATIVE_API_LEVEL=21 -DCMAKE_C_FLAGS="$ANDROID_FLAGS" -DCMAKE_CXX_FLAGS="$ANDROID_FLAGS" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_INSTALL_LIBDIR="lib" -DBUILD_SHARED_LIBS=ON $BUILD_X -DENABLE_PRECOMPILED_HEADERS=OFF $WITH_X $GPU_FLAGS $BUILD_CONTRIB_X .

diff --git a/opencv/opencv_exclude-openblas.patch b/opencv/opencv_exclude-openblas.patch
@@ -0,0 +1,156 @@
+diff -ruN ./platform/gpu/pom.xml ../opencv_wo-openblas/platform/gpu/pom.xml
+--- ./platform/gpu/pom.xml	2020-12-09 23:52:51.449923500 +0900
++++ ../opencv_wo-openblas/platform/gpu/pom.xml	2020-12-10 00:06:50.461835300 +0900
+@@ -22,11 +22,6 @@
+
+   <dependencies>
+     <dependency>
+-      <groupId>org.bytedeco</groupId>
+-      <artifactId>openblas-platform</artifactId>
+-      <version>0.3.12-${project.parent.version}</version>
+-    </dependency>
+-    <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>${javacpp.moduleId}</artifactId>
+       <version>${project.version}</version>
+diff -ruN ./platform/pom.xml ../opencv_wo-openblas/platform/pom.xml
+--- ./platform/pom.xml	2020-12-09 23:52:51.449923500 +0900
++++ ../opencv_wo-openblas/platform/pom.xml	2020-12-10 00:06:50.461835300 +0900
+@@ -21,11 +21,6 @@
+
+   <dependencies>
+     <dependency>
+-      <groupId>org.bytedeco</groupId>
+-      <artifactId>openblas-platform</artifactId>
+-      <version>0.3.12-${project.parent.version}</version>
+-    </dependency>
+-    <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>${javacpp.moduleId}</artifactId>
+       <version>${project.version}</version>
+diff -ruN ./pom.xml ../opencv_wo-openblas/pom.xml
+--- ./pom.xml	2020-12-09 23:52:51.450923300 +0900
++++ ../opencv_wo-openblas/pom.xml	2020-12-10 00:06:50.470277100 +0900
+@@ -14,20 +14,9 @@
+   <version>4.5.0-${project.parent.version}</version>
+   <name>JavaCPP Presets for OpenCV</name>
+
+-  <properties>
+-    <javacpp.nativeRequires>
+-      requires org.bytedeco.openblas.${javacpp.platform.module};
+-    </javacpp.nativeRequires>
+-  </properties>
+-
+   <dependencies>
+     <dependency>
+       <groupId>org.bytedeco</groupId>
+-      <artifactId>openblas</artifactId>
+-      <version>0.3.12-${project.parent.version}</version>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.bytedeco</groupId>
+       <artifactId>numpy</artifactId>
+       <version>1.19.4-${project.parent.version}</version>
+       <optional>true</optional>
+@@ -67,26 +56,17 @@
+         <dependencies>
+           <dependency>
+             <groupId>org.bytedeco</groupId>
+-            <artifactId>openblas-platform</artifactId>
+-            <version>0.3.12-${project.parent.version}</version>
+-          </dependency>
+-          <dependency>
+-            <groupId>org.bytedeco</groupId>
+             <artifactId>numpy-platform</artifactId>
+             <version>1.19.4-${project.parent.version}</version>
+           </dependency>
+         </dependencies>
+         <configuration>
+           <classPaths>
+-            <classPath>${basedir}/../openblas/target/classes/</classPath>
+             <classPath>${basedir}/../cpython/target/classes/</classPath>
+             <classPath>${basedir}/../numpy/target/classes/</classPath>
+             <classPath>${project.build.outputDirectory}</classPath>
+           </classPaths>
+           <includePaths>
+-            <includePath>${basedir}/../openblas/target/classes/org/bytedeco/openblas/include/</includePath>
+-            <includePath>${basedir}/../openblas/src/main/resources/org/bytedeco/openblas/include/</includePath>
+-            <includePath>${basedir}/../openblas/cppbuild/${javacpp.platform}/include/</includePath>
+             <includePath>${basedir}/../cpython/src/main/resources/org/bytedeco/cpython/include/</includePath>
+             <includePath>${basedir}/../cpython/target/classes/org/bytedeco/cpython/include/</includePath>
+             <includePath>${basedir}/../cpython/cppbuild/${javacpp.platform}/include/</includePath>
+@@ -97,28 +77,23 @@
+             <includePath>${basedir}/target/classes/org/bytedeco/${javacpp.packageName}/include/</includePath>
+           </includePaths>
+           <linkPaths>
+-            <linkPath>${basedir}/../openblas/cppbuild/${javacpp.platform}/lib/</linkPath>
+             <linkPath>${basedir}/../cpython/cppbuild/${javacpp.platform}/lib/</linkPath>
+             <linkPath>${basedir}/../numpy/cppbuild/${javacpp.platform}/lib/</linkPath>
+             <linkPath>${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/lib/</linkPath>
+           </linkPaths>
+           <preloadPaths>
+-            <preloadPath>${basedir}/../openblas/cppbuild/${javacpp.platform}/bin/</preloadPath>
+             <preloadPath>${basedir}/../cpython/cppbuild/${javacpp.platform}/bin/</preloadPath>
+             <preloadPath>${basedir}/../numpy/cppbuild/${javacpp.platform}/bin/</preloadPath>
+             <preloadPath>${basedir}/cppbuild/${javacpp.platform}${javacpp.platform.extension}/bin/</preloadPath>
+           </preloadPaths>
+           <buildResources>
+             <buildResource>/${javacpp.platform.library.path}/</buildResource>
+-            <buildResource>/org/bytedeco/openblas/${javacpp.platform}/</buildResource>
+             <buildResource>/org/bytedeco/cpython/${javacpp.platform}/</buildResource>
+             <buildResource>/org/bytedeco/mkldnn/${javacpp.platform}/</buildResource>
+             <buildResource>/org/bytedeco/numpy/${javacpp.platform}/</buildResource>
+           </buildResources>
+           <includeResources>
+             <includeResource>/${javacpp.platform.library.path}/include/</includeResource>
+-            <includeResource>/org/bytedeco/openblas/include/</includeResource>
+-            <includeResource>/org/bytedeco/openblas/${javacpp.platform}/include/</includeResource>
+             <includeResource>/org/bytedeco/cpython/include/</includeResource>
+             <includeResource>/org/bytedeco/cpython/${javacpp.platform}/include/</includeResource>
+             <includeResource>/org/bytedeco/numpy/include/</includeResource>
+@@ -127,8 +102,6 @@
+           <linkResources>
+             <linkResource>/${javacpp.platform.library.path}/</linkResource>
+             <linkResource>/${javacpp.platform.library.path}/lib/</linkResource>
+-            <linkResource>/org/bytedeco/openblas/${javacpp.platform}/</linkResource>
+-            <linkResource>/org/bytedeco/openblas/${javacpp.platform}/lib/</linkResource>
+             <linkResource>/org/bytedeco/cpython/${javacpp.platform}/</linkResource>
+             <linkResource>/org/bytedeco/cpython/${javacpp.platform}/lib/</linkResource>
+             <linkResource>/org/bytedeco/cpython/${javacpp.platform}/libs/</linkResource>
+diff -ruN ./src/main/java/org/bytedeco/opencv/presets/opencv_core.java ../opencv_wo-openblas/src/main/java/org/bytedeco/opencv/presets/opencv_core.java
+--- ./src/main/java/org/bytedeco/opencv/presets/opencv_core.java	2020-12-09 23:52:51.735626100 +0900
++++ ../opencv_wo-openblas/src/main/java/org/bytedeco/opencv/presets/opencv_core.java	2020-12-10 00:06:57.022849700 +0900
+@@ -43,14 +43,11 @@
+ import org.bytedeco.javacpp.tools.InfoMap;
+ import org.bytedeco.javacpp.tools.InfoMapper;
+
+-import org.bytedeco.openblas.presets.*;
+-
+ /**
+  *
+  * @author Samuel Audet
+  */
+ @Properties(
+-    inherit = openblas.class,
+     value = {
+         @Platform(include = {"<opencv2/core/hal/interface.h>", "<opencv2/core/cvdef.h>", "<opencv2/core/hal/hal.hpp>", "<opencv2/core/fast_math.hpp>",
+             "<algorithm>", "<map>", "<opencv2/core/saturate.hpp>", "<opencv2/core/version.hpp>", "<opencv2/core/base.hpp>", "<opencv2/core/cvstd.hpp>",
+@@ -110,7 +107,7 @@
+     }
+
+     public void map(InfoMap infoMap) {
+-        infoMap.putFirst(new Info("openblas_config.h", "cblas.h", "lapacke_config.h", "lapacke_mangling.h", "lapack.h", "lapacke.h", "lapacke_utils.h").skip())
++        infoMap.putFirst(new Info("lapacke_config.h", "lapacke_mangling.h", "lapack.h", "lapacke.h", "lapacke_utils.h").skip())
+                .put(new Info("algorithm", "map", "opencv_adapters.h").skip())
+                .put(new Info("__cplusplus", "CV_StaticAssert", "CV__LEGACY_PERSISTENCE").define())
+                .put(new Info("__OPENCV_BUILD", "defined __ICL", "defined __ICC", "defined __ECL", "defined __ECC", "defined __INTEL_COMPILER",
+diff -ruN ./src/main/java9/module-info.java ../opencv_wo-openblas/src/main/java9/module-info.java
+--- ./src/main/java9/module-info.java	2020-12-09 23:52:51.747626100 +0900
++++ ../opencv_wo-openblas/src/main/java9/module-info.java	2020-12-10 00:06:57.038473900 +0900
+@@ -1,6 +1,5 @@
+ module org.bytedeco.opencv {
+   requires transitive org.bytedeco.javacpp;
+-  requires transitive org.bytedeco.openblas;
+
+   exports org.bytedeco.opencv;
+   exports org.bytedeco.opencv.global;