update

microsoft · Oct 11, 2024 · dc6906a · dc6906a
1 parent 33377af
commit dc6906a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-linux-ci-pipeline.yml
@@ -47,11 +47,6 @@ jobs:
     clean: true
     submodules: none
 
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.8'
-      addToPath: true
-
   - template: templates/get-docker-image-steps.yml
     parameters:
       Dockerfile: tools/ci_build/github/linux/docker/inference/x86_64/python/cpu/Dockerfile
@@ -91,16 +86,7 @@ jobs:
           /bin/bash -c "
             set -ex; \
             ccache -s; \
-            /opt/python/cp312-cp312/bin/python3 /onnxruntime_src/tools/ci_build/build.py \
-              --build_dir /build --cmake_generator 'Unix Makefiles' \
-              --config Release \
-              --skip_submodule_sync \
-              --build_shared_lib \
-              --parallel --use_binskim_compliant_compile_flags \
-              --build_wheel \
-              --enable_onnx_tests \
-              --enable_training \
-              --use_cache; \
+            tools/ci_build/github/linux/build_linux_python_package.sh -p /opt/python/cp312-cp312/bin/python3 -e -x "--enable_training" \
                 ccache -sv; \
                 ccache -z"
       workingDirectory: $(Build.SourcesDirectory)

diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packing-jobs.yml b/tools/ci_build/github/azure-pipelines/templates/mac-cpu-packing-jobs.yml
@@ -77,9 +77,7 @@ jobs:
       export ONNX_ML=1
       export CMAKE_ARGS="-DONNX_GEN_PB_TYPE_STUBS=ON -DONNX_WERROR=OFF"
       python3 -m pip install -r '$(Build.SourcesDirectory)/tools/ci_build/github/linux/docker/scripts/requirements.txt'
-      displayName: 'Install dependencies'
-      env:
-        CCACHE_DIR: $(PROTO_CACHE_DIR)
+
 
   - ${{ if eq(parameters.MacosArch, 'universal2') }}:
     - template: mac-cpu-packaging-steps.yml

diff --git a/tools/ci_build/github/linux/build_linux_python_package.sh b/tools/ci_build/github/linux/build_linux_python_package.sh
@@ -6,7 +6,7 @@ set -e -x
 mkdir -p /build/dist
 
 EXTRA_ARG=""
-
+ENABLE_CACHE=false
 # Put 3.10 at the last because Ubuntu 22.04 use python 3.10 and we will upload the intermediate build files of this 
 # config to Azure DevOps Artifacts and download them to a Ubuntu 22.04 machine to run the tests.
 PYTHON_EXES=("/opt/python/cp311-cp311/bin/python3.11" "/opt/python/cp312-cp312/bin/python3.12" "/opt/python/cp313-cp313/bin/python3.13" "/opt/python/cp310-cp310/bin/python3.10")
@@ -18,6 +18,7 @@ d) BUILD_DEVICE=${OPTARG};;
 p) PYTHON_EXES=${OPTARG};;
 x) EXTRA_ARG=${OPTARG};;
 c) BUILD_CONFIG=${OPTARG};;
+e) ENABLE_CACHE=true
 *) echo "Usage: $0 -d <GPU|CPU|NPU> [-p <python_exe_path>] [-x <extra_build_arg>] [-c <build_config>]"
    exit 1;;
 esac
@@ -30,6 +31,9 @@ BUILD_ARGS=("--build_dir" "/build" "--config" "$BUILD_CONFIG" "--update" "--buil
 if [ "$BUILD_CONFIG" != "Debug" ]; then
     BUILD_ARGS+=("--enable_lto")
 fi
+if [ "$ENABLE_CACHE" = true ] ; then
+    BUILD_ARGS+=("--use_cache")
+fi
 
 ARCH=$(uname -m)