Merge branch 'main' into port/libtorch

luncliff · Nov 17, 2024 · dc3188d · dc3188d
2 parents 8c6cee1 + c9603df
commit dc3188d
Show file tree

Hide file tree

Showing 24 changed files with 140 additions and 459 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,19 +1,13 @@
 # https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 
-orbs:
-  aws-cli: circleci/aws-cli@5.1.0 # https://circleci.com/developer/orbs/orb/circleci/aws-cli
-  android: circleci/android@2.5.0
+orbs: # https://circleci.com/developer/orbs
+  aws-cli: circleci/aws-cli@5
+  android: circleci/android@3
 
 workflows:
   overlay:
     jobs:
-      - x64_linux:
-          filters:
-            branches:
-              ignore:
-                - gh-pages
-                - docs
       - arm64_android:
           filters:
             branches:
@@ -22,95 +16,41 @@ workflows:
                 - docs
 
 jobs:
-  x64_linux:
-    machine:
-      image: ubuntu-2204:current
-    resource_class: large
-    environment:
-      VCPKG_DOWNLOADS: /tmp/vcpkg-caches
-      VCPKG_DEFAULT_BINARY_CACHE: /tmp/vcpkg-caches
-    steps:
-      - checkout
-      - aws-cli/setup # check project variables
-      - run:
-          name: "Setup: microsoft/vcpkg(2024.08.23)"
-          command: |
-            sudo apt-get update -y -q
-            sudo apt-get install -y -q curl zip unzip tar
-            mkdir -p $VCPKG_DOWNLOADS
-            mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
-            git clone --branch=2024.08.23 --depth=1 https://github.com/microsoft/vcpkg
-            pushd vcpkg
-              ./bootstrap-vcpkg.sh
-              ./vcpkg --version
-            popd
-            pwd
-      - restore_cache:
-          keys:
-            - v2435-linux-{{ checksum ".circleci/config.yml" }}
-            - v2435-linux-{{ .Branch }}
-            - v2435-linux-main
-      - run:
-          name: "Install APT packages"
-          command: |
-            sudo apt-get install -y --fix-missing \
-              ninja-build nasm # g++-12 libstdc++-12-dev
-      - run:
-          name: "Install: port-linux.txt"
-          command: |
-            ./vcpkg install \
-              --keep-going --recurse \
-              --clean-buildtrees-after-build \
-              --clean-packages-after-build \
-              --overlay-ports "$(pwd)/../ports" \
-              --overlay-triplets "$(pwd)/../triplets" \
-              $(cat "$(pwd)/../.circleci/port-linux.txt")
-          environment:
-            VCPKG_DEFAULT_TRIPLET: x64-linux
-            # CC: gcc-12
-            # CXX: g++-12
-          working_directory: vcpkg
-          no_output_timeout: 1h
-      - save_cache:
-          key: v2435-linux-{{ .Branch }}
-          paths:
-            - /tmp/vcpkg-caches
-      - save_cache:
-          key: v2435-linux-{{ checksum ".circleci/config.yml" }}
-          paths:
-            - /tmp/vcpkg-caches
-      - store_artifacts:
-          path: vcpkg/buildtrees/
-          destination: "build-logs"
-
   arm64_android:
     docker: # https://circleci.com/developer/images/image/cimg/android
-      - image: cimg/android:2024.09.1-ndk # 27.0.12077973
+      - image: cimg/android:2024.11.1-ndk # 28.0.12433566
     resource_class: large
     environment:
       VCPKG_DOWNLOADS: /tmp/vcpkg-caches
       VCPKG_DEFAULT_BINARY_CACHE: /tmp/vcpkg-caches
     steps:
       - checkout
       - aws-cli/setup # check project variables
-      - android/accept-licenses
+      - android/accept_licenses
+      - android/change_java_version:
+          java_version: 17
       - run:
-          name: "Setup: microsoft/vcpkg(2024.08.23)"
+          name: "Setup: microsoft/vcpkg(2024.10.21)"
           command: |
             sudo apt-get update -y -q
             sudo apt-get install -y -q curl zip unzip tar
             mkdir -p $VCPKG_DOWNLOADS
             mkdir -p $VCPKG_DEFAULT_BINARY_CACHE
-            git clone --branch=2024.08.23 --depth=1 https://github.com/microsoft/vcpkg
+            git clone --branch=2024.10.21 --depth=1 https://github.com/microsoft/vcpkg
             pushd vcpkg
               ./bootstrap-vcpkg.sh
             popd
             echo 'export PATH="$VCPKG_ROOT:$PATH"' >> "$BASH_ENV"
           working_directory: /tmp
           environment:
             VCPKG_ROOT: /tmp/vcpkg
+      - restore_cache:
+          keys:
+            - v2445-android-{{ checksum ".circleci/config.yml" }}
+            - v2445-android-{{ .Branch }}
+            - v2445-android-main
       - run:
-          name: "Install: azure-port-android.txt"
+          name: "Install: port-android.txt"
           command: |
             vcpkg --version
             vcpkg install \
@@ -120,12 +60,20 @@ jobs:
               --clean-packages-after-build \
               --overlay-ports "$(pwd)/ports" \
               --overlay-triplets "$(pwd)/triplets" \
-              $(cat "$(pwd)/test/azure-port-android.txt")
+              $(cat "$(pwd)/.circleci/port-android.txt")
           environment:
             VCPKG_ROOT: /tmp/vcpkg
             VCPKG_DEFAULT_TRIPLET: arm64-android
             VCPKG_MAX_CONCURRENCY: 2
           no_output_timeout: 1h
+      - save_cache:
+          key: v2445-android-{{ .Branch }}
+          paths:
+            - /tmp/vcpkg-caches
+      - save_cache:
+          key: v2445-android-{{ checksum ".circleci/config.yml" }}
+          paths:
+            - /tmp/vcpkg-caches
       - store_artifacts:
           path: buildtrees/ # follow --x-buildtrees-root
           destination: "build-logs"
diff --git a/test/azure-port-android.txt → .circleci/port-android.txt b/test/azure-port-android.txt → .circleci/port-android.txt
diff --git a/.circleci/port-linux.txt b/.circleci/port-linux.txt
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -19,19 +19,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - vcpkg_tag: "2024.06.15"
-            vcpkg_commit: "f7423ee180c4b7f40d43402c2feb3859161ef625"
-          - vcpkg_tag: "2024.07.12"
-            vcpkg_commit: "1de2026f28ead93ff1773e6e680387643e914ea1"
-          - vcpkg_tag: "2024.08.23"
-            vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
+          - vcpkg_tag: "2024.10.21"
+            vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
       fail-fast: false
     env:
       VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
       VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
       - uses: ConorMacBride/install-package@v1.1.0
         with:
           brew: autoconf automake libtool
@@ -44,9 +40,9 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ap-northeast-2
+          aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/cache@v4.0.2
+      - uses: actions/cache@v4.1.2
         with:
           key: "v2432-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
           path: |

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -19,19 +19,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - vcpkg_tag: "2024.06.15"
-            vcpkg_commit: "f7423ee180c4b7f40d43402c2feb3859161ef625"
-          - vcpkg_tag: "2024.07.12"
-            vcpkg_commit: "1de2026f28ead93ff1773e6e680387643e914ea1"
-          - vcpkg_tag: "2024.08.23"
-            vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
+          - vcpkg_tag: "2024.10.21"
+            vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
       fail-fast: false
     env:
       VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
       VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/triplets"
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
       - uses: ConorMacBride/install-package@v1.1.0
         with:
           apt: nuget nasm libnuma-dev libopenmpi-dev libx11-dev libxi-dev libxext-dev libx11-xcb-dev
@@ -40,9 +36,9 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ap-northeast-2
+          aws-region: ${{ secrets.AWS_REGION }}
 
-      - uses: actions/cache@v4.0.2
+      - uses: actions/cache@v4.1.2
         with:
           key: "v2432-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
           path: |

diff --git a/.github/workflows/build-windows-hosted.yml b/.github/workflows/build-windows-hosted.yml
@@ -21,20 +21,20 @@ jobs:
     strategy:
       matrix:
         include:
-          - vcpkg_tag: "2024.06.15"
-            vcpkg_commit: "f7423ee180c4b7f40d43402c2feb3859161ef625"
           - vcpkg_tag: "2024.07.12"
             vcpkg_commit: "1de2026f28ead93ff1773e6e680387643e914ea1"
           - vcpkg_tag: "2024.08.23"
             vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
-          - vcpkg_tag: "2024.09.23"
-            vcpkg_commit: "f176b58f35a75f9f8f54099cd9df97d2e2793a2e"
+          - vcpkg_tag: "2024.09.30"
+            vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
+          - vcpkg_tag: "2024.10.21"
+            vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
       fail-fast: false
     env:
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
       VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/triplets"
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
       - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
@@ -103,18 +103,16 @@ jobs:
     strategy:
       matrix:
         include:
-          - vcpkg_tag: "2024.06.15"
-            vcpkg_commit: "f7423ee180c4b7f40d43402c2feb3859161ef625"
-          - vcpkg_tag: "2024.08.23"
-            vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
-          - vcpkg_tag: "2024.09.23"
-            vcpkg_commit: "f176b58f35a75f9f8f54099cd9df97d2e2793a2e"
+          - vcpkg_tag: "2024.09.30"
+            vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
+          - vcpkg_tag: "2024.10.21"
+            vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
       fail-fast: false
     env:
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
       VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/triplets"
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
       - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
@@ -168,18 +166,16 @@ jobs:
     strategy:
       matrix:
         include:
-          - vcpkg_tag: "2024.06.15"
-            vcpkg_commit: "f7423ee180c4b7f40d43402c2feb3859161ef625"
-          - vcpkg_tag: "2024.08.23"
-            vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
-          - vcpkg_tag: "2024.09.23"
-            vcpkg_commit: "f176b58f35a75f9f8f54099cd9df97d2e2793a2e"
+          - vcpkg_tag: "2024.09.30"
+            vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
+          - vcpkg_tag: "2024.10.21"
+            vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
       fail-fast: false
     env:
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
       VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/triplets"
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
       - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -19,19 +19,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - vcpkg_tag: "2024.06.15"
-            vcpkg_commit: "f7423ee180c4b7f40d43402c2feb3859161ef625"
-          - vcpkg_tag: "2024.07.12"
-            vcpkg_commit: "1de2026f28ead93ff1773e6e680387643e914ea1"
-          - vcpkg_tag: "2024.08.23"
-            vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
+          - vcpkg_tag: "2024.10.21"
+            vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
       fail-fast: false
     env:
       VCPKG_FEATURE_FLAGS: "registries,binarycaching,manifests,versions"
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
       VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/triplets"
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
       - uses: microsoft/setup-msbuild@v2
         with:
           msbuild-architecture: x64
@@ -40,12 +36,12 @@ jobs:
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ap-northeast-2
+          aws-region: ${{ secrets.AWS_REGION }}
 
       - name: "Enalbe LongPath"
         run: git config --system core.longpaths true
 
-      - uses: actions/cache@v4.0.2
+      - uses: actions/cache@v4.1.2
         with:
           key: "v2432-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
           path: |

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,7 +12,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
 
       - name: "Run gh(auth)"
         run: |

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -27,8 +27,8 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
-      - uses: actions/checkout@v4.2.0
-      - uses: actions/setup-python@v5.2.0
+      - uses: actions/checkout@v4.2.2
+      - uses: actions/setup-python@v5.3.0
         with:
           python-version: 3.11
           architecture: x64
@@ -50,8 +50,8 @@ jobs:
   mkdocs_test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.0
-      - uses: actions/setup-python@v5.2.0
+      - uses: actions/checkout@v4.2.2
+      - uses: actions/setup-python@v5.3.0
         with:
           python-version: 3.11
           architecture: x64