Build NumPy for Mac OSX ARM64

bytedeco · Oct 20, 2023 · 4947aba · 4947aba
1 parent 3cbd3cd
commit 4947aba
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 32 deletions.
diff --git a/.github/workflows/numpy.yml b/.github/workflows/numpy.yml
@@ -18,41 +18,34 @@ env:
   CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
   STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
 jobs:
-#  linux-armhf:
-#    runs-on: ubuntu-20.04
-#    steps:
-#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-#  linux-arm64:
-#    runs-on: ubuntu-20.04
-#    steps:
-#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-#  linux-ppc64le:
-#    runs-on: ubuntu-20.04
-#    steps:
-#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-#  linux-x86:
-#    runs-on: ubuntu-20.04
-#    steps:
-#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  linux-x86_64:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  macosx-x86_64:
+  #  linux-armhf:
+  #    runs-on: ubuntu-20.04
+  #    steps:
+  #      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+  #  linux-arm64:
+  #    runs-on: ubuntu-20.04
+  #    steps:
+  #      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+  #  linux-ppc64le:
+  #    runs-on: ubuntu-20.04
+  #    steps:
+  #      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+  #  linux-x86:
+  #    runs-on: ubuntu-20.04
+  #    steps:
+  #      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+  macosx-arm64:
     runs-on: macos-11
     steps:
+      #   - uses: ./../actions/deploy-macosx@actions
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
-#  windows-x86:
-#    runs-on: windows-2019
-#    steps:
-#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
-  windows-x86_64:
-    runs-on: windows-2019
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
+  #  windows-x86:
+  #    runs-on: windows-2019
+  #    steps:
+  #      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
-    needs: [linux-x86_64, macosx-x86_64, windows-x86_64]
-#    needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
+    needs: [macosx-arm64]
+    #    needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
     runs-on: ubuntu-20.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
diff --git a/numpy/platform/pom.xml b/numpy/platform/pom.xml
@@ -71,6 +71,12 @@
       <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-arm64}</classifier>
+    </dependency>
 <!--    <dependency>-->
 <!--      <groupId>${project.groupId}</groupId>-->
 <!--      <artifactId>${javacpp.moduleId}</artifactId>-->
@@ -95,7 +101,7 @@
             <configuration>
               <archive>
                 <manifestEntries>
-                  <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-ppc64le.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
+                  <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-ppc64le.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-macosx-arm64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
                 </manifestEntries>
               </archive>
             </configuration>
@@ -146,6 +152,7 @@
 //                      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.arm64;
 //                      requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
                       requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
                     }

diff --git a/pom.xml b/pom.xml
@@ -1464,6 +1464,7 @@
         <module>libraw</module>
         <module>leptonica</module>
         <module>tesseract</module>
+        <module>numpy</module>
         <module>sentencepiece</module>
       </modules>
       <properties>