Added Java Bindings for Adapters API

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

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+package ai.onnxruntime.genai;
+
+
+public final class Adapters implements AutoCloseable {
+  private long nativeHandle = 0;
+
+  /**
+   * Constructs an Adapters object with the given model.
+   *
+   * @param model The model.
+   * @throws GenAIException If the call to the GenAI native API fails.
+   */
+  public Adapters(Model model) throws GenAIException {
+    if (model.nativeHandle() == 0) {
+      throw new IllegalArgumentException("model has been freed and is invalid");
+    }
+
+    nativeHandle = createAdapters(model.nativeHandle());
+  }
+
+  /**
+   * Load an adapter from the specified path.
+   *
+   * @param adapterFilePath The path of the adapter.
+   * @param adapterName A unique user supplied adapter identifier.
+   * @throws GenAIException If the call to the GenAI native API fails.
+   */
+  public void loadAdapters(String adapterFilePath, String adapterName) throws GenAIException {
+    if (nativeHandle == 0) {
+      throw new IllegalStateException("Instance has been freed and is invalid");
+    }
+
+    loadAdapter(nativeHandle, adapterFilePath, adapterName);
+  }
+
+  /**
+   * Unload an adapter.
+   *
+   * @param adapterName A unique user supplied adapter identifier.
+   * @throws GenAIException If the call to the GenAI native API fails.
+   */
+  public void unloadAdapters(String adapterName) throws GenAIException {
+    if (nativeHandle == 0) {
+      throw new IllegalStateException("Instance has been freed and is invalid");
+    }
+
+    unloadAdapter(nativeHandle, adapterName);
+  }
+
+  @Override
+  public void close() {
+    if (nativeHandle != 0) {
+      destroyAdapters(nativeHandle);
+      nativeHandle = 0;
+    }
+  }
+
+  long nativeHandle() {
+    return nativeHandle;
+  }
+
+  private native long createAdapters(long modelHandle)
+      throws GenAIException;
+
+  private native void destroyAdapters(long nativeHandle);
+
+  private native void loadAdapter(long nativeHandle, String adapterFilePath, String adapterName)
+      throws GenAIException;
+
+  private native void unloadAdapter(long nativeHandle, String adapterName)
+      throws GenAIException;
+}

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

@@ -117,6 +117,15 @@ public int getLastTokenInSequence(long sequenceIndex) throws GenAIException {
     return getSequenceLastToken(nativeHandle, sequenceIndex);
   }
 
+  public void setActiveAdapter(Adapters adapters, String adapterName) throws GenAIException {
+    if (nativeHandle == 0) {
+      throw new IllegalStateException("Instance has been freed and is invalid");
+    }
+
+    setActiveAdapter(nativeHandle, adapters.nativeHandle(), adapterName);
+  }
+
+
   /** Closes the Generator and releases any associated resources. */
   @Override
   public void close() {
@@ -169,4 +178,7 @@ private native int[] getSequenceNative(long nativeHandle, long sequenceIndex)
 
   private native int getSequenceLastToken(long nativeHandle, long sequenceIndex)
       throws GenAIException;
+
+  private native void setActiveAdapter(long nativeHandle, long adaptersNativeHandle, String adapterName)
+      throws GenAIException;
 }

src/java/src/main/native/ai_onnxruntime_genai_Adapters.cpp

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+#include "ai_onnxruntime_genai_Adapters.h"
+
+#include "ort_genai_c.h"
+#include "utils.h"
+
+using namespace Helpers;
+
+JNIEXPORT jlong JNICALL
+Java_ai_onnxruntime_genai_Adapters_createAdapters(JNIEnv* env, jobject thiz, jlong model_handle) {
+  const OgaModel* model = reinterpret_cast<const OgaModel*>(model_handle);
+  OgaAdapters* adapters = nullptr;
+  if (ThrowIfError(env, OgaCreateAdapters(model, &adapters))) {
+    return 0;
+  }
+
+  return reinterpret_cast<jlong>(adapters);
+}
+
+JNIEXPORT void JNICALL
+Java_ai_onnxruntime_genai_Adapters_destroyAdapters(JNIEnv* env, jobject thiz, jlong native_handle) {
+  OgaDestroyAdapters(reinterpret_cast<OgaAdapters*>(native_handle));
+}
+
+JNIEXPORT void JNICALL
+Java_ai_onnxruntime_genai_Adapters_loadAdapter(JNIEnv* env, jobject thiz, jlong native_handle,
+                                               jstring adapter_file_path, jstring adapter_name) {
+  CString file_path{env, adapter_file_path};
+  CString name{env, adapter_name};
+  ThrowIfError(env, OgaLoadAdapter(reinterpret_cast<OgaAdapters*>(native_handle), file_path, name));
+}
+
+JNIEXPORT void JNICALL
+Java_ai_onnxruntime_genai_Adapters_unloadAdapter(JNIEnv* env, jobject thiz, jlong native_handle, jstring adapter_name) {
+  CString name{env, adapter_name};
+  ThrowIfError(env, OgaUnloadAdapter(reinterpret_cast<OgaAdapters*>(native_handle), name));
+}

src/java/src/main/native/ai_onnxruntime_genai_Generator.cpp

@@ -78,3 +78,12 @@ Java_ai_onnxruntime_genai_Generator_getSequenceLastToken(JNIEnv* env, jobject th
 
   return jint(tokens[num_tokens - 1]);
 }
+
+JNIEXPORT void JNICALL
+Java_ai_onnxruntime_genai_Generator_setActiveAdapter(JNIEnv* env, jobject thiz, jlong native_handle,
+                                                     jlong adapters_native_handle, jstring adapter_name) {
+  CString name{env, adapter_name};
+  ThrowIfError(env, OgaSetActiveAdapter(reinterpret_cast<OgaGenerator*>(native_handle),
+                                        reinterpret_cast<OgaAdapters*>(adapters_native_handle),
+                                        name));
+}

src/models/onnxruntime_api.h

@@ -101,6 +101,8 @@ p_session_->Run(nullptr, input_names, inputs, std::size(inputs), output_names, o
 #define PATH_MAX (4096)
 #endif
 
+#if !defined(__ANDROID__)
+
 #define LOG_WHEN_ENABLED(LOG_FUNC) \
   if (Generators::g_log.enabled && Generators::g_log.ort_lib) LOG_FUNC
 
@@ -110,6 +112,8 @@ p_session_->Run(nullptr, input_names, inputs, std::size(inputs), output_names, o
 #define LOG_ERROR(...) LOG_WHEN_ENABLED(Generators::Log("error", __VA_ARGS__))
 #define LOG_FATAL(...) LOG_WHEN_ENABLED(Generators::Log("fatal", __VA_ARGS__))
 
+#endif
+
 /** \brief Free functions and a few helpers are defined inside this namespace. Otherwise all types are the C API types
  *
  */