[onnxruntime] resurrecting test feature

luncliff · May 25, 2024 · a3c14cb · a3c14cb
1 parent e59bd8a
commit a3c14cb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/ports/onnxruntime/portfile.cmake b/ports/onnxruntime/portfile.cmake
@@ -117,10 +117,7 @@ if("cuda" IN_LIST FEATURES)
     if(NOT DEFINED ENV{CUDA_PATH})
         message(FATAL_ERROR "ENV{CUDA_PATH} is required. Please check the environment variable")
     endif()
-    message(STATUS "Using CUDA: $ENV{CUDA_PATH}")
-    get_filename_component(CUDA_VERSION "$ENV{CUDA_PATH}" NAME)
-    string(REPLACE "v" "" CUDA_VERSION "${CUDA_VERSION}") # "v12.0" -> "12.0"
-    message(STATUS "  version: ${CUDA_VERSION}")
+    message(STATUS "Using ENV{CUDA_PATH}: $ENV{CUDA_PATH}")
 endif()
 
 # see tools/ci_build/build.py

diff --git a/ports/onnxruntime/vcpkg.json b/ports/onnxruntime/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "onnxruntime",
   "version-semver": "1.17.3",
-  "port-version": 1,
+  "port-version": 2,
   "description": "ONNX Runtime: cross-platform, high performance ML inferencing and training accelerator",
   "homepage": "https://onnxruntime.ai/",
   "license": "MIT",
@@ -24,7 +24,12 @@
       "name": "nsync",
       "platform": "!windows"
     },
-    "onnx",
+    {
+      "name": "onnx",
+      "features": [
+        "disable-static-generation"
+      ]
+    },
     "optional-lite",
     "protobuf",
     {
@@ -74,9 +79,6 @@
         "mpi"
       ]
     },
-    "nccl": {
-      "description": "Build with NCCL support"
-    },
     "openvino": {
       "description": "Build with OpenVINO support",
       "supports": "!(osx | ios | android | emscripten)",
@@ -101,6 +103,13 @@
         }
       ]
     },
+    "test": {
+      "description": "Build ONNXRuntime unit tests, micro-benchmarks",
+      "dependencies": [
+        "benchmark",
+        "gtest"
+      ]
+    },
     "xnnpack": {
       "description": "Build with XNNPack support",
       "dependencies": [