* Upgrade presets for MKL 2024.0

bytedeco · Dec 24, 2023 · caa70ac · caa70ac
1 parent ba8bb08
commit caa70ac
Show file tree

Hide file tree

Showing 14 changed files with 5,766 additions and 7,276 deletions.
diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml
@@ -214,8 +214,8 @@ runs:
 
         if [[ "$CI_DEPLOY_MODULE" == "mkl" ]]; then
           echo Installing MKL
-          curl -LO https://registrationcenter-download.intel.com/akdlm/IRC_NAS/cd17b7fe-500e-4305-a89b-bd5b42bfd9f8/l_onemkl_p_2023.1.0.46342_offline.sh
-          $SUDO bash l_onemkl_p_2023.1.0.46342_offline.sh -s -a -s --eula accept
+          curl -LO https://registrationcenter-download.intel.com/akdlm/IRC_NAS/86d6a4c1-c998-4c6b-9fff-ca004e9f7455/l_onemkl_p_2024.0.0.49673_offline.sh
+          $SUDO bash l_onemkl_p_2024.0.0.49673_offline.sh -s -a -s --eula accept
           export MAVEN_OPTIONS="-Djavacpp.platform.compiler=clang++"
 
           # Allocate a swapfile on Linux as it's not enabled by default

diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml
@@ -15,6 +15,8 @@ runs:
         C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm mingw-w64-x86_64-nasm mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-gcc mingw-w64-i686-gcc mingw-w64-x86_64-gcc-fortran mingw-w64-i686-gcc-fortran mingw-w64-x86_64-libwinpthread-git mingw-w64-i686-libwinpthread-git mingw-w64-x86_64-SDL2 mingw-w64-i686-SDL2 mingw-w64-x86_64-ragel"
         set "PATH=C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\msys64\usr\bin;%PATH%"
 
+        C:\msys64\usr\bin\bash -lc "pacman -Q"
+
         echo Installing Windows SDK 8.1
         curl -Lo sdksetup.exe https://go.microsoft.com/fwlink/p/?LinkId=323507
         sdksetup.exe /features OptionId.WindowsDesktopSoftwareDevelopmentKit OptionId.NetFxSoftwareDevelopmentKit /quiet
@@ -148,10 +150,8 @@ runs:
 
         if "%CI_DEPLOY_MODULE%"=="mkl" (
           echo Installing MKL
-          curl -LO https://registrationcenter-download.intel.com/akdlm/IRC_NAS/e0195cbc-2c9b-4489-9542-c1447e70df30/w_onemkl_p_2023.1.0.46356_offline.exe
-          curl -LO https://registrationcenter-download.intel.com/akdlm/IRC_NAS/c961e083-5685-4f0b-ada5-c6cf16f561dd/w_BaseKit_32bit_p_2023.1.0.46402_offline.exe
-          w_onemkl_p_2023.1.0.46356_offline.exe -s -a -s --eula accept
-          w_BaseKit_32bit_p_2023.1.0.46402_offline.exe -s -a -s --eula accept
+          curl -LO https://registrationcenter-download.intel.com/akdlm/IRC_NAS/b5a4ff98-2c98-4b28-87f7-32082cac359e/w_onemkl_p_2024.0.0.49672_offline.exe
+          w_onemkl_p_2024.0.0.49672_offline.exe -s -a -s --eula accept
         )
 
         if "%CI_DEPLOY_PLATFORM%"=="windows-x86" if "%CI_DEPLOY_MODULE%"=="flycapture" (

diff --git a/.github/workflows/mkl.yml b/.github/workflows/mkl.yml
@@ -25,10 +25,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  macosx-x86_64:
-    runs-on: macos-11
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
+#  macosx-x86_64:
+#    runs-on: macos-11
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
 #  windows-x86:
 #    runs-on: windows-2019
 #    steps:
@@ -39,7 +39,7 @@ jobs:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
 #    needs: [linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
-    needs: [linux-x86_64, macosx-x86_64, windows-x86_64]
+    needs: [linux-x86_64, windows-x86_64]
     runs-on: ubuntu-20.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@
  * Refactor and improve presets for PyTorch ([pull #1360](https://github.com/bytedeco/javacpp-presets/pull/1360))
  * Include `mkl_lapack.h` header file in presets for MKL ([issue #1388](https://github.com/bytedeco/javacpp-presets/issues/1388))
  * Map new higher-level C++ API of Triton Inference Server ([pull #1361](https://github.com/bytedeco/javacpp-presets/pull/1361))
- * Upgrade presets for OpenCV 4.8.1, FFmpeg 6.1, HDF5 1.14.3, DNNL 3.3.2, OpenBLAS 0.3.25, ARPACK-NG 3.9.1, CPython 3.12.0, NumPy 1.26.2, SciPy 1.11.4, LLVM 17.0.6, Leptonica 1.83.1, Tesseract 5.3.3, CUDA 12.3.0, cuDNN 8.9.5, NCCL 2.18.5, PyTorch 2.1.2 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.15.0, Triton Inference Server 2.38.0, DepthAI 2.23.0, ONNX 1.15.0, ONNX Runtime 1.16.3, TVM 0.14.0, and their dependencies
+ * Upgrade presets for OpenCV 4.8.1, FFmpeg 6.1, HDF5 1.14.3, MKL 2024.0, DNNL 3.3.2, OpenBLAS 0.3.25, ARPACK-NG 3.9.1, CPython 3.12.0, NumPy 1.26.2, SciPy 1.11.4, LLVM 17.0.6, Leptonica 1.83.1, Tesseract 5.3.3, CUDA 12.3.0, cuDNN 8.9.5, NCCL 2.18.5, PyTorch 2.1.2 ([pull #1426](https://github.com/bytedeco/javacpp-presets/pull/1426)), TensorFlow Lite 2.15.0, Triton Inference Server 2.38.0, DepthAI 2.23.0, ONNX 1.15.0, ONNX Runtime 1.16.3, TVM 0.14.0, and their dependencies
 
 ### June 6, 2023 version 1.5.9
  * Virtualize `nvinfer1::IGpuAllocator` from TensorRT to allow customization ([pull #1367](https://github.com/bytedeco/javacpp-presets/pull/1367))

diff --git a/README.md b/README.md
@@ -196,7 +196,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * HDF5 1.14.x  https://www.hdfgroup.org/downloads/
  * Hyperscan 5.4.x  https://github.com/intel/hyperscan
  * LZ4 1.9.x  https://github.com/lz4/lz4
- * MKL 2023.x  https://software.intel.com/mkl
+ * MKL 2024.x  https://software.intel.com/mkl
  * MKL-DNN 0.21.x  https://github.com/oneapi-src/oneDNN
  * DNNL 3.3.x  https://github.com/oneapi-src/oneDNN
  * OpenBLAS 0.3.25  http://www.openblas.net/

diff --git a/mkl/README.md b/mkl/README.md
@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * MKL 2023.1.0  https://software.intel.com/mkl
+ * MKL 2024.0.0  https://software.intel.com/mkl
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -40,22 +40,22 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.mkl</groupId>
     <artifactId>mkl</artifactId>
-    <version>1.5.9</version>
+    <version>1.5.10-SNAPSHOT</version>
     <properties>
         <exec.mainClass>DGEMMExample</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform</artifactId>
-            <version>2023.1-1.5.9</version>
+            <version>2024.0-1.5.10-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform-redist</artifactId>
-            <version>2023.1-1.5.9</version>
+            <version>2024.0-1.5.10-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

diff --git a/mkl/cppbuild.sh b/mkl/cppbuild.sh
@@ -19,45 +19,47 @@ case $PLATFORM in
             exit 1
         fi
         cp -a /opt/intel/oneapi/mkl/latest/include/* include/
-        cp -a /opt/intel/oneapi/mkl/latest/lib/ia32/* /opt/intel/oneapi/compiler/latest/linux/compiler/lib/ia32_lin/* lib/
+        cp -a /opt/intel/oneapi/mkl/latest/lib32/* /opt/intel/oneapi/compiler/latest/lib32/* lib/
         ;;
     linux-x86_64)
         if [[ ! -d "/opt/intel/oneapi/mkl/" ]]; then
             echo "Please install MKL under the default installation directory"
             exit 1
         fi
         cp -a /opt/intel/oneapi/mkl/latest/include/* include/
-        cp -a /opt/intel/oneapi/mkl/latest/lib/intel64/* /opt/intel/oneapi/compiler/latest/linux/compiler/lib/intel64_lin/* lib/
+        cp -a /opt/intel/oneapi/mkl/latest/lib/* /opt/intel/oneapi/compiler/latest/lib/* lib/
         ;;
     macosx-*)
         if [[ ! -d "/opt/intel/oneapi/mkl/" ]]; then
             echo "Please install MKL under the default installation directory"
             exit 1
         fi
         cp -a /opt/intel/oneapi/mkl/latest/include/* include/
-        cp -a /opt/intel/oneapi/mkl/latest/lib/* /opt/intel/oneapi/compiler/latest/mac/compiler/lib/* lib/
+        cp -a /opt/intel/oneapi/mkl/latest/lib/* /opt/intel/oneapi/compiler/latest/lib/* lib/
         ;;
     windows-x86)
         if [[ ! -d "/C/Program Files (x86)/Intel/oneAPI/" ]]; then
             echo "Please install MKL under the default installation directory"
             exit 1
         fi
         cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/include/* include/
-        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/lib/ia32/* lib/
-        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/redist/ia32/* bin/
-        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/compiler/latest/windows/redist/ia32_win/compiler/* bin/
+        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/lib32/* lib/
+        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/bin32/* bin/
+        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/compiler/latest/bin32/* bin/
         ;;
     windows-x86_64)
         if [[ ! -d "/C/Program Files (x86)/Intel/oneAPI/" ]]; then
             echo "Please install MKL under the default installation directory"
             exit 1
         fi
         cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/include/* include/
-        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/lib/intel64/* lib/
-        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/redist/intel64/* bin/
-        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/compiler/latest/windows/redist/intel64_win/compiler/* bin/
+        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/lib/* lib/
+        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/mkl/latest/bin/* bin/
+        cp -a /C/Program\ Files\ \(x86\)/Intel/oneAPI/compiler/latest/bin/* bin/
         ;;
     *)
         echo "Error: Platform \"$PLATFORM\" is not supported"
         ;;
 esac
+
+rm include/ia32 include/intel64 lib/ia32 lib/intel64 lib/locale bin/ia32 bin/intel64 bin/locale | true
diff --git a/mkl/platform/pom.xml b/mkl/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>mkl-platform</artifactId>
-  <version>2023.1-${project.parent.version}</version>
+  <version>2024.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for MKL</name>
 
   <properties>
@@ -42,12 +42,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>-->
@@ -119,7 +119,7 @@
                     module org.bytedeco.${javacpp.moduleId}.platform {
 //                      requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
+//                      requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
 //                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
                       requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }

diff --git a/mkl/platform/redist/pom.xml b/mkl/platform/redist/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>mkl-platform-redist</artifactId>
-  <version>2023.1-${project.parent.version}</version>
+  <version>2024.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform Redist for MKL</name>
 
   <properties>

diff --git a/mkl/pom.xml b/mkl/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>mkl</artifactId>
-  <version>2023.1-${project.parent.version}</version>
+  <version>2024.0-${project.parent.version}</version>
   <name>JavaCPP Presets for MKL</name>
 
   <dependencies>

diff --git a/mkl/samples/pom.xml b/mkl/samples/pom.xml
@@ -12,14 +12,14 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform</artifactId>
-            <version>2023.1-1.5.10-SNAPSHOT</version>
+            <version>2024.0-1.5.10-SNAPSHOT</version>
         </dependency>
 
         <!-- Additional dependencies to use bundled full version of MKL -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>mkl-platform-redist</artifactId>
-            <version>2023.1-1.5.10-SNAPSHOT</version>
+            <version>2024.0-1.5.10-SNAPSHOT</version>
         </dependency>
 
     </dependencies>