ci gh-actions: run setup-python

luncliff · Oct 8, 2023 · 37fcffa · 37fcffa
1 parent e6df79b
commit 37fcffa
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -19,6 +19,10 @@ jobs:
       VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: 'pip'
       - name: "create cache folders"
         run: |
           mkdir -p ${VCPKG_DOWNLOADS}

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -17,6 +17,10 @@ jobs:
       VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: 'pip'
       - name: "create cache folders"
         run: |
           mkdir -p ${VCPKG_DOWNLOADS}

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -18,6 +18,10 @@ jobs:
       VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+          cache: 'pip'
       - name: "create cache folders"
         run: |
           New-Item -Type Directory -Force ${env:VCPKG_DOWNLOADS}

diff --git a/ports/libtorch/portfile.cmake b/ports/libtorch/portfile.cmake
@@ -26,8 +26,14 @@ vcpkg_execute_required_process(
 find_program(PROTOC NAMES protoc PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf" REQUIRED NO_DEFAULT_PATH NO_CMAKE_PATH)
 message(STATUS "Using protoc: ${PROTOC}")
 
-vcpkg_find_acquire_program(PYTHON3)
+# vcpkg_find_acquire_program(PYTHON3)
+find_program(PYTHON3 NAMES python3 python REQUIRED)
 message(STATUS "Using Python3: ${PYTHON3}")
+x_vcpkg_get_python_packages(
+    PYTHON_EXECUTABLE "${PYTHON3}"
+    PACKAGES typing-extensions pyyaml numpy sympy
+)
+
 get_filename_component(PYTHON_PATH "${PYTHON3}" PATH)
 vcpkg_add_to_path(PREPEND "${PYTHON_PATH}")
 
@@ -115,9 +121,9 @@ vcpkg_cmake_configure(
         -DUSE_SYSTEM_LIBS=ON
         -DBUILD_PYTHON=OFF
         -DUSE_NUMPY=OFF
-        -DUSE_METAL=OFF
-        -DUSE_PYTORCH_METAL=OFF
-        -DUSE_PYTORCH_METAL_EXPORT=OFF
+        -DUSE_METAL=${VCPKG_TARGET_IS_OSX}
+        -DUSE_PYTORCH_METAL=${VCPKG_TARGET_IS_OSX}
+        -DUSE_PYTORCH_METAL_EXPORT=${VCPKG_TARGET_IS_OSX}
         -DUSE_GFLAGS=ON
         -DUSE_GLOG=ON
         -DUSE_LMDB=ON

diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json
@@ -46,6 +46,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-get-python-packages",
+      "host": true
     }
   ],
   "default-features": [