wip

qryxip · Sep 9, 2023 · ebf613c · ebf613c
1 parent f302390
commit ebf613c
Showing 1 changed file with 135 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,6 +30,29 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - artifact_name: onnxruntime-win-x64
+            os: windows-2019
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Windows CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --update --build --build_shared_lib
+            result_dir: build/Windows
+            release_config: Release
+          - artifact_name: onnxruntime-linux-x64
+            os: ubuntu-20.04
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --update --build --build_shared_lib
+            result_dir: build/Linux
+            release_config: Release
+          - artifact_name: onnxruntime-linux-x64-gpu
+            os: ubuntu-20.04
+            cuda_version: 11.6.2
+            cudnn_url: https://developer.download.nvidia.com/compute/redist/cudnn/v8.4.1/local_installers/11.6/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Linux CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --update --build --build_shared_lib --use_cuda
+            result_dir: build/Linux
+            release_config: Release
+          - artifact_name: onnxruntime-osx-x86_64
+            os: macos-12
+            build_opts: --cmake_extra_defines CMAKE_SYSTEM_NAME=Darwin CMAKE_SYSTEM_PROCESSOR=x86_64 --config Release --parallel --update --build --build_shared_lib
+            result_dir: build/MacOS
+            release_config: Release
+
           - artifact_name: onnxruntime-linux-armhf
             os: ubuntu-20.04
             cc_version: "8"
@@ -88,13 +111,15 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: microsoft/onnxruntime
-          submodules: true
+          submodules: recursive
           ref: v${{ env.ONNXRUNTIME_VERSION }}
 
       - name: Dump matrix context
         env:
           MATRIX_CONTEXT: ${{ toJSON(matrix) }}
-        run: echo "$MATRIX_CONTEXT" > matrix.json
+        run: |
+          echo "$MATRIX_CONTEXT" > matrix.json
+          cat matrix.json
 
       - name: Cache build result
         id: cache-build-result
@@ -104,7 +129,14 @@ jobs:
           key: ${{ matrix.artifact_name }}-v${{ env.ONNXRUNTIME_VERSION }}-cache-v1-${{ hashFiles('matrix.json') }}
 
       - name: Install build dependencies
-        if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu')
+        if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu') && matrix.cuda_version && matrix.cudnn_url
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y moreutils
+          python3 -m pip install -r tools/ci_build/github/linux/docker/inference/x64/python/cpu/scripts/requirements.txt
+
+      - name: Install build dependencies
+        if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu') && matrix.arch
         run: |
           sudo apt-get update
           sudo apt-get install -y \
@@ -116,6 +148,37 @@ jobs:
               g++-${{ matrix.cxx_version }}${{ env.ARCH_SUFFIX }} \
               python3
 
+      - name: Setup CUDA
+        if: matrix.cuda_version
+        uses: Jimver/[email protected]
+        with:
+          method: network
+          cuda: ${{ matrix.cuda_version }}
+
+      - name: Setup cuDNN
+        if: matrix.cudnn_url
+        shell: bash
+        run: |
+          set -eux
+
+          mkdir download
+
+          if [ "$RUNNER_OS" = Windows ]; then
+            curl -L "${{ matrix.cudnn_url }}" > download/cudnn.zip
+            unzip download/cudnn.zip -d download
+            rm download/cudnn.zip
+          else
+            curl -L "${{ matrix.cudnn_url }}" > download/cudnn.tar.xz
+            tar -Jxf download/cudnn.tar.xz -C download/
+            rm download/cudnn.tar.xz
+          fi
+
+          cudnn_path=$(find download -maxdepth 1 -name 'cudnn-*')
+          tree "$cudnn_path"
+
+          echo "CUDNN_PATH=$cudnn_path" >> "$GITHUB_ENV"
+          echo "$cudnn_path/bin" >> "$GITHUB_PATH"
+
       # ONNX Runtime v1.14.1 requires CMake 3.24 or higher.
       - name: Install CMake
         if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu')
@@ -125,8 +188,8 @@ jobs:
           wget -O cmake.sh "https://github.com/Kitware/CMake/releases/download/v${{ env.CMAKE_VERSION }}/cmake-${{ env.CMAKE_VERSION }}-linux-x86_64.sh"
           sudo bash cmake.sh --skip-license --prefix=/usr/local
 
-      - name: Configure build environment
-        if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu')
+      - name: Configure build environment (Linux arm/aarch64)
+        if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu') && matrix.arch
         run: |
           # Required for arm build
           # https://github.com/microsoft/onnxruntime/issues/4189#issuecomment-642528278
@@ -143,38 +206,89 @@ jobs:
           echo "CC=${{ env.ARCH_PREFIX }}gcc-${{ matrix.cc_version }}" >> "$GITHUB_ENV"
           echo "CXX=${{ env.ARCH_PREFIX }}g++-${{ matrix.cxx_version }}" >> "$GITHUB_ENV"
 
+      # ???
+      - name: Configure build environment (Linux CUDA)
+        if: steps.cache-build-result.outputs.cache-hit != 'true' && startsWith(matrix.os, 'ubuntu') && matrix.cuda_version
+        run: |
+          cat <(echo "include_directories($CUDNN_PATH/include)") cmake/CMakeLists.txt | sponge cmake/CMakeLists.txt
+
       - name: Build ONNX Runtime
         if: steps.cache-build-result.outputs.cache-hit != 'true'
+        shell: bash
         run: |
           # add --arm for gcc-8: https://github.com/microsoft/onnxruntime/issues/4189
           # skip test: https://github.com/microsoft/onnxruntime/issues/2436
           # ONNX Runtime v1.9.0 requires CMAKE_SYSTEM_PROCESSOR, https://github.com/microsoft/onnxruntime/releases/tag/v1.9.0
           # Both CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR are required.
-          bash ./build.sh ${{ matrix.build_opts }}
+
+          if ${{ !!(matrix.cuda_version && matrix.cudnn_url) }}; then
+            export CPLUS_INCLUDE_PATH="$CUDNN_PATH"
+            extra_opts="--cuda_home $CUDA_PATH --cudnn_home $CUDNN_PATH"
+          else
+            extra_opts=
+          fi
+
+          if [ "$RUNNER_OS" = Windows ]; then
+            # shellcheck disable=SC2086
+            cmd ./build.bat ${{ matrix.build_opts }} $extra_opts
+          else
+            # shellcheck disable=SC2086
+            bash ./build.sh ${{ matrix.build_opts }} $extra_opts
+          fi
 
       - name: Organize artifact
         shell: bash
         run: |
           # コピー先artifactを予め削除しておく
           rm -rf ${{ matrix.result_dir }}/${{ matrix.artifact_name }}
           rm -rf ./artifact
-          # Set library name
-          if [[ ${{ matrix.artifact_name }} == onnxruntime-linux-* ]]; then
-            ONNXRUNTIME_NAME=libonnxruntime.so.${{ env.ONNXRUNTIME_VERSION }}
-          elif [[ ${{ matrix.artifact_name }} == onnxruntime-ios-* ]]; then
-            ONNXRUNTIME_NAME=libonnxruntime.${{ env.ONNXRUNTIME_VERSION }}.dylib
+
+          ls -l ${{ matrix.result_dir }}/${{ matrix.release_config }}
+
+          mkdir -p ./artifact/${{ matrix.artifact_name }}/include
+          mkdir -p ./artifact/${{ matrix.artifact_name }}/lib
+
+          cp ./LICENSE ./artifact/${{ matrix.artifact_name }}/
+          cp ./ThirdPartyNotices.txt ./artifact/${{ matrix.artifact_name }}/
+          cp ./VERSION_NUMBER ./artifact/${{ matrix.artifact_name }}/
+
+          cp ./include/onnxruntime/core/session/onnxruntime_c_api.h ./artifact/${{ matrix.artifact_name }}/include/
+
+          # TODO
+          #mv include/onnxruntime/core/providers/dml/dml_provider_factory.h ./artifact/${{ matrix.artifact_name }}/include/
+
+          if ${{ contains(matrix.artifact_name, 'ios') }}; then
+            cp ${{ matrix.result_dir }}/CMakeFiles/onnxruntime.dir/link.txt ./artifact/${{ matrix.artifact_name }}/include/
+          else
+            cp ${{ matrix.result_dir }}/${{ matrix.release_config }}/CMakeFiles/onnxruntime.dir/link.txt ./artifact/${{ matrix.artifact_name }}/include/
+          fi
+
+          if [ "$RUNNER_OS" = Windows ]; then
+            staticlib_ext=lib
           else
-            echo "Unknown target found : ${{ matrix.artifact_name }}"
-            return 1
+            staticlib_ext=a
           fi
-          ./tools/ci_build/github/linux/copy_strip_binary.sh \
-            -r ${{ matrix.result_dir }} \
-            -a ${{ matrix.artifact_name }} \
-            -l $ONNXRUNTIME_NAME \
-            -c ${{ matrix.release_config }} \
-            -s "$(pwd)" \
-            -t "$(git rev-parse HEAD)"
-          mv ${{ matrix.result_dir }}/${{ matrix.artifact_name }} ./artifact/
+          find ${{ matrix.result_dir }}/${{ matrix.release_config }} -name "*.$staticlib_ext" -exec cp {} ./artifact/${{ matrix.artifact_name }}/lib/ ';'
+
+          ls -l ./artifact/${{ matrix.artifact_name }}/
+
+          ## Set library name
+          #if [[ ${{ matrix.artifact_name }} == onnxruntime-linux-* ]]; then
+          #  ONNXRUNTIME_NAME=libonnxruntime.so.${{ env.ONNXRUNTIME_VERSION }}
+          #elif [[ ${{ matrix.artifact_name }} == onnxruntime-ios-* ]]; then
+          #  ONNXRUNTIME_NAME=libonnxruntime.${{ env.ONNXRUNTIME_VERSION }}.dylib
+          #else
+          #  echo "Unknown target found : ${{ matrix.artifact_name }}"
+          #  return 1
+          #fi
+          #./tools/ci_build/github/linux/copy_strip_binary.sh \
+          #  -r ${{ matrix.result_dir }} \
+          #  -a ${{ matrix.artifact_name }} \
+          #  -l $ONNXRUNTIME_NAME \
+          #  -c ${{ matrix.release_config }} \
+          #  -s "$(pwd)" \
+          #  -t "$(git rev-parse HEAD)"
+          #mv ${{ matrix.result_dir }}/${{ matrix.artifact_name }} ./artifact/
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2