Specify ARM64 arch to fix Java macOS CI build (#1149)

.github/workflows/mac-cpu-arm64-build.yml

@@ -101,7 +101,7 @@ jobs:
         run: |
           set -e -x
           source genai-macos-venv/bin/activate
-          python3 build.py --config=Release --build_dir build/cpu/osx-arm64 --build_java --parallel --cmake_generator "Unix Makefiles"
+          python3 build.py --config=Release --build_dir build/cpu/osx-arm64 --build_java --parallel --cmake_generator "Unix Makefiles" --macos MacOSX --osx_arch arm64 --apple_deploy_target 12.0 --apple_sysroot macosx
 
       - name: Run tests
         run: |

build.py

@@ -500,9 +500,6 @@ def update(args: argparse.Namespace, env: dict[str, str]):
     if args.ios or args.macos:
         platform_name = "macabi" if args.macos == "Catalyst" else args.apple_sysroot
         command += [
-            "-DENABLE_PYTHON=OFF",
-            "-DENABLE_TESTS=OFF",
-            "-DENABLE_MODEL_BENCHMARK=OFF",
             "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + args.apple_deploy_target,
             f"-DBUILD_APPLE_FRAMEWORK={'ON' if args.build_apple_framework else 'OFF'}",
             "-DPLATFORM_NAME=" + platform_name,
@@ -534,6 +531,9 @@ def _get_opencv_toolchain_file():
             f"-DIPHONEOS_DEPLOYMENT_TARGET={args.apple_deploy_target}",
             # The following arguments are specific to the OpenCV toolchain file
             f"-DCMAKE_TOOLCHAIN_FILE={_get_opencv_toolchain_file()}",
+            "-DENABLE_PYTHON=OFF",
+            "-DENABLE_TESTS=OFF",
+            "-DENABLE_MODEL_BENCHMARK=OFF",
         ]
 
     if args.macos == "Catalyst":
@@ -552,6 +552,9 @@ def _get_opencv_toolchain_file():
             f"-DCMAKE_CC_FLAGS=--target={macabi_target}",
             f"-DCMAKE_CC_FLAGS_RELEASE=-O3 -DNDEBUG --target={macabi_target}",
             "-DMAC_CATALYST=1",
+            "-DENABLE_PYTHON=OFF",
+            "-DENABLE_TESTS=OFF",
+            "-DENABLE_MODEL_BENCHMARK=OFF",
         ]
 
     if args.arm64:

src/java/src/main/java/ai/onnxruntime/genai/Config.java

@@ -4,8 +4,8 @@
 package ai.onnxruntime.genai;
 
 /**
- * Use Config to set the ORT execution providers (EPs) and their options. The EPs are applied based on 
- * insertion order.
+ * Use Config to set the ORT execution providers (EPs) and their options. The EPs are applied based
+ * on insertion order.
  */
 public final class Config implements AutoCloseable {
   private long nativeHandle;

src/java/src/main/java/ai/onnxruntime/genai/NamedTensors.java

@@ -3,9 +3,7 @@
  */
 package ai.onnxruntime.genai;
 
-/**
- * This class is a list of tensors with names that match up with model input names.
- */
+/** This class is a list of tensors with names that match up with model input names. */
 public class NamedTensors implements AutoCloseable {
   private long nativeHandle;
 

src/java/src/test/android/app/src/androidTest/java/ai/onnxruntime_genai/example/javavalidator/SimpleTest.kt

@@ -90,7 +90,7 @@ class SimpleTest {
         // the test model requires manual input as the token ids have to be < 1000 but the configured tokenizer
         // has a larger vocab size and the input ids it generates are not valid.
         val model = Model(newModelPath)
-        val params = model.createGeneratorParams()
+        val params = GeneratorParams(model)
 
         val sequenceLength = 4
         val batchSize = 2