Move GPU-related enums into litert::GpuOptions.

LiteRT-PiperOrigin-RevId: 826639123

Author: gcarranza-1

litert/cc/litert_common.h

@@ -45,32 +45,6 @@ inline HwAcceleratorSet operator|(HwAcceleratorSet lhs, HwAccelerators rhs) {
   return HwAcceleratorSet(lhs.value | static_cast<int>(rhs));
 }
 
-enum class DelegateBufferStorageType : int {
-  kDefault = kLiteRtDelegateBufferStorageTypeDefault,
-  kBuffer = kLiteRtDelegateBufferStorageTypeBuffer,
-  kTexture2D = kLiteRtDelegateBufferStorageTypeTexture2D,
-};
-
-enum class GpuBackend : int {
-  kAutomatic = kLiteRtGpuBackendAutomatic,
-  kOpenCl = kLiteRtGpuBackendOpenCl,
-  kWebGpu = kLiteRtGpuBackendWebGpu,
-  kOpenGl = kLiteRtGpuBackendOpenGl,
-};
-
-enum class GpuPriority : int {
-  kDefault = kLiteRtGpuPriorityDefault,
-  kLow = kLiteRtGpuPriorityLow,
-  kNormal = kLiteRtGpuPriorityNormal,
-  kHigh = kLiteRtGpuPriorityHigh,
-};
-
-enum class DelegatePrecision : int {
-  kDefault = kLiteRtDelegatePrecisionDefault,
-  kFp16 = kLiteRtDelegatePrecisionFp16,
-  kFp32 = kLiteRtDelegatePrecisionFp32,
-};
-
 }  // namespace litert
 
 #endif  // THIRD_PARTY_ODML_LITERT_LITERT_CC_LITERT_COMMON_H_

litert/cc/options/BUILD

@@ -120,7 +120,6 @@ cc_library(
         "//litert/c:litert_common",
         "//litert/c:litert_opaque_options",
         "//litert/c/options:litert_gpu_options",
-        "//litert/cc:litert_common",
         "//litert/cc:litert_expected",
         "//litert/cc:litert_macros",
         "//litert/cc:litert_opaque_options",

litert/cc/options/litert_gpu_options.cc

@@ -15,7 +15,6 @@
 #include "litert/cc/options/litert_gpu_options.h"
 
 #include "litert/c/litert_common.h"
-#include "litert/c/litert_opaque_options.h"
 #include "litert/c/options/litert_gpu_options.h"
 #include "litert/cc/internal/litert_handle.h"
 #include "litert/cc/litert_expected.h"
@@ -45,6 +44,12 @@ LiteRtStatus GpuOptions::EnableBenchmarkMode(bool enabled) {
   return LiteRtSetGpuOptionsBenchmarkMode(Get(), enabled);
 }
 
+Expected<void> GpuOptions::SetBackend(Backend backend) {
+  LITERT_RETURN_IF_ERROR(LiteRtSetGpuOptionsGpuBackend(
+      Get(), static_cast<LiteRtGpuBackend>(backend)));
+  return {};
+}
+
 LiteRtStatus GpuOptions::SetGpuBackend(LiteRtGpuBackend backend) {
   return LiteRtSetGpuOptionsGpuBackend(Get(), backend);
 }
@@ -54,11 +59,24 @@ LiteRtStatus GpuOptions::EnableAllowSrcQuantizedFcConvOps(bool enabled) {
       Get(), enabled);
 }
 
+Expected<void> GpuOptions::SetPrecision(Precision precision) {
+  LITERT_RETURN_IF_ERROR(LiteRtSetGpuAcceleratorCompilationOptionsPrecision(
+      Get(), static_cast<LiteRtDelegatePrecision>(precision)));
+  return {};
+}
+
 LiteRtStatus GpuOptions::SetDelegatePrecision(
     LiteRtDelegatePrecision precision) {
   return LiteRtSetGpuAcceleratorCompilationOptionsPrecision(Get(), precision);
 }
 
+Expected<void> GpuOptions::SetBufferStorageType(BufferStorageType type) {
+  LITERT_RETURN_IF_ERROR(
+      LiteRtSetGpuAcceleratorCompilationOptionsUseBufferStorageType(
+          Get(), static_cast<LiteRtDelegateBufferStorageType>(type)));
+  return {};
+}
+
 LiteRtStatus GpuOptions::SetBufferStorageType(
     LiteRtDelegateBufferStorageType type) {
   return LiteRtSetGpuAcceleratorCompilationOptionsUseBufferStorageType(Get(),
@@ -100,6 +118,12 @@ LiteRtStatus GpuOptions::AddExternalTensorPattern(const char* pattern) {
   return LiteRtAddGpuOptionsExternalTensorPattern(Get(), pattern);
 }
 
+Expected<void> GpuOptions::SetPriority(Priority priority) {
+  LITERT_RETURN_IF_ERROR(LiteRtSetGpuOptionsGpuPriority(
+      Get(), static_cast<LiteRtGpuPriority>(priority)));
+  return {};
+}
+
 LiteRtStatus GpuOptions::SetGpuPriority(LiteRtGpuPriority priority) {
   return LiteRtSetGpuOptionsGpuPriority(Get(), priority);
 }

litert/cc/options/litert_gpu_options.h

@@ -16,7 +16,6 @@
 #define THIRD_PARTY_ODML_LITERT_LITERT_CC_OPTIONS_LITERT_GPU_OPTIONS_H_
 
 #include "litert/c/litert_common.h"
-#include "litert/cc/litert_common.h"
 #include "litert/cc/litert_expected.h"
 #include "litert/cc/litert_opaque_options.h"
 
@@ -36,26 +35,53 @@ class GpuOptions : public litert::OpaqueOptions {
   LiteRtStatus EnableInfiniteFloatCapping(bool enabled);
   LiteRtStatus EnableBenchmarkMode(bool enabled);
   LiteRtStatus EnableAllowSrcQuantizedFcConvOps(bool enabled);
-  LiteRtStatus SetDelegatePrecision(DelegatePrecision precision);
-  [[deprecated("Use SetDelegatePrecision above instead.")]]
+
+  enum class Precision : int {
+    kDefault = kLiteRtDelegatePrecisionDefault,
+    kFp16 = kLiteRtDelegatePrecisionFp16,
+    kFp32 = kLiteRtDelegatePrecisionFp32,
+  };
+  Expected<void> SetPrecision(Precision precision);
+  [[deprecated("Use SetPrecision above instead.")]]
   LiteRtStatus SetDelegatePrecision(LiteRtDelegatePrecision precision);
-  LiteRtStatus SetDelegateBufferStorageType(
-      DelegateBufferStorageType type);
-  [[deprecated("Use SetDelegateBufferStorageType above instead.")]]
+
+  enum class BufferStorageType : int {
+    kDefault = kLiteRtDelegateBufferStorageTypeDefault,
+    kBuffer = kLiteRtDelegateBufferStorageTypeBuffer,
+    kTexture2D = kLiteRtDelegateBufferStorageTypeTexture2D,
+  };
+  Expected<void> SetBufferStorageType(BufferStorageType type);
+  [[deprecated("Use SetBufferStorageType above instead.")]]
   LiteRtStatus SetBufferStorageType(LiteRtDelegateBufferStorageType type);
+
   LiteRtStatus SetPreferTextureWeights(bool prefer_texture_weights);
   LiteRtStatus SetSerializationDir(const char* serialization_dir);
   LiteRtStatus SetModelCacheKey(const char* model_cache_key);
   LiteRtStatus SetSerializeProgramCache(bool serialize_program_cache);
   LiteRtStatus SetSerializeExternalTensors(bool serialize_external_tensors);
   LiteRtStatus EnableExternalTensorsMode(bool enabled);
   LiteRtStatus AddExternalTensorPattern(const char* pattern);
-  LiteRtStatus SetGpuBackend(GpuBackend backend);
-  [[deprecated("Use SetGpuBackend above instead.")]]
+
+  enum class Backend : int {
+    kAutomatic = kLiteRtGpuBackendAutomatic,
+    kOpenCl = kLiteRtGpuBackendOpenCl,
+    kWebGpu = kLiteRtGpuBackendWebGpu,
+    kOpenGl = kLiteRtGpuBackendOpenGl,
+  };
+  Expected<void> SetBackend(Backend backend);
+  [[deprecated("Use SetBackend above instead.")]]
   LiteRtStatus SetGpuBackend(LiteRtGpuBackend backend);
-  LiteRtStatus SetGpuPriority(GpuPriority priority);
-  [[deprecated("Use SetGpuPriority above instead.")]]
+
+  enum class Priority : int {
+    kDefault = kLiteRtGpuPriorityDefault,
+    kLow = kLiteRtGpuPriorityLow,
+    kNormal = kLiteRtGpuPriorityNormal,
+    kHigh = kLiteRtGpuPriorityHigh,
+  };
+  Expected<void> SetPriority(Priority priority);
+  [[deprecated("Use SetPriority above instead.")]]
   LiteRtStatus SetGpuPriority(LiteRtGpuPriority priority);
+
   LiteRtStatus SetMadviseOriginalSharedTensors(
       bool madvise_original_shared_tensors);
 };