Fix builds for MKL and ONNX Runtime

bytedeco · Dec 25, 2023 · d6d71af · d6d71af
1 parent 0a29159
commit d6d71af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mkl/platform/redist/pom.xml b/mkl/platform/redist/pom.xml
@@ -38,12 +38,12 @@
       <version>${project.version}</version>
       <classifier>${javacpp.platform.linux-x86_64}</classifier>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>${javacpp.moduleId}</artifactId>
-      <version>${project.version}</version>
-      <classifier>${javacpp.platform.macosx-x86_64}</classifier>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>${project.groupId}</groupId>-->
+<!--      <artifactId>${javacpp.moduleId}</artifactId>-->
+<!--      <version>${project.version}</version>-->
+<!--      <classifier>${javacpp.platform.macosx-x86_64}</classifier>-->
+<!--    </dependency>-->
 <!--    <dependency>-->
 <!--      <groupId>${project.groupId}</groupId>-->
 <!--      <artifactId>${javacpp.moduleId}</artifactId>-->
@@ -115,7 +115,7 @@
                     module org.bytedeco.${javacpp.moduleId}.platform.redist {
 //                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86.redist;
                       requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64.redist;
-                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64.redist;
+//                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64.redist;
 //                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86.redist;
                       requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64.redist;
                     }

diff --git a/onnxruntime/cppbuild.sh b/onnxruntime/cppbuild.sh
@@ -90,7 +90,7 @@ sedinplace 's/ONNXRUNTIME_PROVIDERS_SHARED)/ONNXRUNTIME_PROVIDERS_SHARED onnxrun
 sedinplace 's/DNNL_TAG v.*)/DNNL_TAG v3.3.3)/g' cmake/external/dnnl.cmake
 sedinplace 's/DNNL_SHARED_LIB libdnnl.1.dylib/DNNL_SHARED_LIB libdnnl.2.dylib/g' cmake/external/dnnl.cmake
 sedinplace 's/DNNL_SHARED_LIB libdnnl.so.1/DNNL_SHARED_LIB libdnnl.so.2/g' cmake/external/dnnl.cmake
-sedinplace 's/ CMAKE_ARGS/CMAKE_ARGS -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_BUILD_TESTS=OFF/g' cmake/external/dnnl.cmake
+sedinplace 's/ CMAKE_ARGS/CMAKE_ARGS -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_BUILD_TESTS=OFF -DDNNL_CPU_RUNTIME=SEQ/g' cmake/external/dnnl.cmake
 sedinplace 's#GIT_REPOSITORY ${DNNL_URL}#URL https://github.com/oneapi-src/oneDNN/archive/refs/tags/${DNNL_TAG}.tar.gz#g' cmake/external/dnnl.cmake
 sedinplace 's/cudnnSetRNNDescriptor(/cudnnSetRNNDescriptor_v6(/g' onnxruntime/core/providers/cuda/rnn/cudnn_rnn_base.h
 sedinplace 's/HOST_NAME_MAX/sysconf(_SC_HOST_NAME_MAX)/g' onnxruntime/core/providers/cuda/cuda_call.cc