From 0ecb071fc4cfb662fea93d5ee8e8e54fcb71eec0 Mon Sep 17 00:00:00 2001 From: Jane Xu Date: Mon, 30 Jan 2023 18:28:32 +0000 Subject: [PATCH] [BE][CI] change references from .jenkins to .ci (#92624) Pull Request resolved: https://github.com/pytorch/pytorch/pull/92624 Approved by: https://github.com/ZainRizvi, https://github.com/huydhn --- .ci/caffe2/common.sh | 2 +- .ci/pytorch/codegen-test.sh | 4 +-- .../perf_test/compare_with_baseline.py | 2 +- .ci/pytorch/perf_test/test_cpu_speed_torch.sh | 2 +- .../perf_test/test_cpu_speed_torch_tensor.sh | 2 +- .ci/pytorch/short-perf-test-cpu.sh | 4 +-- .ci/pytorch/short-perf-test-gpu.sh | 2 +- .ci/pytorch/test.sh | 2 +- .circleci/config.yml | 26 +++++++++---------- .../scripts/functorch_doc_push_script.sh | 2 +- .circleci/scripts/python_doc_push_script.sh | 2 +- .../job-specs/job-specs-custom.yml | 26 +++++++++---------- .github/actions/build-android/action.yml | 2 +- .github/merge_rules.yaml | 6 ++--- .github/workflows/_bazel-build-test.yml | 4 +-- .github/workflows/_linux-build.yml | 2 +- .github/workflows/_linux-test.yml | 6 ++--- .github/workflows/_mac-build.yml | 2 +- .github/workflows/_mac-test.yml | 2 +- .github/workflows/_rocm-test.yml | 6 ++--- .github/workflows/_win-build.yml | 2 +- .github/workflows/_win-test.yml | 2 +- .github/workflows/create_release.yml | 2 +- .lintrunner.toml | 2 +- CONTRIBUTING.md | 4 +-- README.md | 4 +-- scripts/release_notes/commitlist.py | 2 +- test/mobile/lightweight_dispatch/build.sh | 2 +- test/run_test.py | 2 +- test/test_determination.py | 2 +- tools/testing/modulefinder_determinator.py | 2 +- 31 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.ci/caffe2/common.sh b/.ci/caffe2/common.sh index 0870555365647..e4c7218068e19 100644 --- a/.ci/caffe2/common.sh +++ b/.ci/caffe2/common.sh @@ -28,7 +28,7 @@ fi # /usr/local/caffe2 is where the cpp bits are installed to in cmake-only # builds. In +python builds the cpp tests are copied to /usr/local/caffe2 so -# that the test code in .jenkins/test.sh is the same +# that the test code in .ci/test.sh is the same INSTALL_PREFIX="/usr/local/caffe2" mkdir -p "$gtest_reports_dir" || true diff --git a/.ci/pytorch/codegen-test.sh b/.ci/pytorch/codegen-test.sh index 4794dc48eb896..719a9ca6232b6 100755 --- a/.ci/pytorch/codegen-test.sh +++ b/.ci/pytorch/codegen-test.sh @@ -3,8 +3,8 @@ # This script can also be used to test whether your diff changes any codegen output. # # Run it before and after your change: -# .jenkins/pytorch/codegen-test.sh -# .jenkins/pytorch/codegen-test.sh +# .ci/pytorch/codegen-test.sh +# .ci/pytorch/codegen-test.sh # # Then run diff to compare the generated files: # diff -Naur diff --git a/.ci/pytorch/perf_test/compare_with_baseline.py b/.ci/pytorch/perf_test/compare_with_baseline.py index 95f60edd4bcaa..6d2839ac1db41 100644 --- a/.ci/pytorch/perf_test/compare_with_baseline.py +++ b/.ci/pytorch/perf_test/compare_with_baseline.py @@ -62,7 +62,7 @@ raise Exception('''\n z-value >= 3, there is high chance of perf regression.\n To reproduce this regression, run -`cd .jenkins/pytorch/perf_test/ && bash {}.sh` on your local machine +`cd .ci/pytorch/perf_test/ && bash {}.sh` on your local machine and compare the runtime before/after your code change. '''.format(test_name)) else: diff --git a/.ci/pytorch/perf_test/test_cpu_speed_torch.sh b/.ci/pytorch/perf_test/test_cpu_speed_torch.sh index 0f639aec5338f..77b86e77a26fb 100644 --- a/.ci/pytorch/perf_test/test_cpu_speed_torch.sh +++ b/.ci/pytorch/perf_test/test_cpu_speed_torch.sh @@ -19,7 +19,7 @@ test_cpu_speed_torch () { fi if ! python perf-tests/modules/test_cpu_torch.py "${ARGS[@]}"; then - echo "To reproduce this regression, run \`cd .jenkins/pytorch/perf_test/ && bash ${FUNCNAME[0]}.sh\` on your local machine and compare the runtime before/after your code change." + echo "To reproduce this regression, run \`cd .ci/pytorch/perf_test/ && bash ${FUNCNAME[0]}.sh\` on your local machine and compare the runtime before/after your code change." exit 1 fi } diff --git a/.ci/pytorch/perf_test/test_cpu_speed_torch_tensor.sh b/.ci/pytorch/perf_test/test_cpu_speed_torch_tensor.sh index e45b8adf7c7c9..fc8ede36c90ee 100644 --- a/.ci/pytorch/perf_test/test_cpu_speed_torch_tensor.sh +++ b/.ci/pytorch/perf_test/test_cpu_speed_torch_tensor.sh @@ -19,7 +19,7 @@ test_cpu_speed_torch_tensor () { fi if ! python perf-tests/modules/test_cpu_torch_tensor.py "${ARGS[@]}"; then - echo "To reproduce this regression, run \`cd .jenkins/pytorch/perf_test/ && bash ${FUNCNAME[0]}.sh\` on your local machine and compare the runtime before/after your code change." + echo "To reproduce this regression, run \`cd .ci/pytorch/perf_test/ && bash ${FUNCNAME[0]}.sh\` on your local machine and compare the runtime before/after your code change." exit 1 fi } diff --git a/.ci/pytorch/short-perf-test-cpu.sh b/.ci/pytorch/short-perf-test-cpu.sh index 7cb4608a75f73..41f0a493b55f2 100755 --- a/.ci/pytorch/short-perf-test-cpu.sh +++ b/.ci/pytorch/short-perf-test-cpu.sh @@ -2,10 +2,10 @@ SCRIPT_PARENT_DIR=$(dirname "${BASH_SOURCE[0]}") -# shellcheck source=.jenkins/pytorch/common.sh +# shellcheck source=.ci/pytorch/common.sh source "$SCRIPT_PARENT_DIR/common.sh" -cd .jenkins/pytorch/perf_test +cd .ci/pytorch/perf_test echo "Running CPU perf test for PyTorch..." diff --git a/.ci/pytorch/short-perf-test-gpu.sh b/.ci/pytorch/short-perf-test-gpu.sh index d7a49cb18842d..5fc897fefb7d8 100755 --- a/.ci/pytorch/short-perf-test-gpu.sh +++ b/.ci/pytorch/short-perf-test-gpu.sh @@ -3,7 +3,7 @@ # shellcheck source=./common.sh source "$(dirname "${BASH_SOURCE[0]}")/common.sh" -pushd .jenkins/pytorch/perf_test +pushd .ci/pytorch/perf_test echo "Running GPU perf test for PyTorch..." diff --git a/.ci/pytorch/test.sh b/.ci/pytorch/test.sh index af1c031c1d90f..7b6d7b5bb7122 100755 --- a/.ci/pytorch/test.sh +++ b/.ci/pytorch/test.sh @@ -816,7 +816,7 @@ test_vec256() { } test_docs_test() { - .jenkins/pytorch/docs-test.sh + .ci/pytorch/docs-test.sh } test_executorch() { diff --git a/.circleci/config.yml b/.circleci/config.yml index 58f58b2f0f31b..836b1f8b6850f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -526,8 +526,8 @@ jobs: export AWS_SECRET_ACCESS_KEY=${CIRCLECI_AWS_SECRET_KEY_FOR_SCCACHE_S3_BUCKET_V4} set -x - chmod a+x .jenkins/pytorch/macos-build.sh - unbuffer .jenkins/pytorch/macos-build.sh 2>&1 | ts + chmod a+x .ci/pytorch/macos-build.sh + unbuffer .ci/pytorch/macos-build.sh 2>&1 | ts - persist_to_workspace: root: /Users/distiller/workspace/ @@ -562,8 +562,8 @@ jobs: export AWS_SECRET_ACCESS_KEY=${CIRCLECI_AWS_SECRET_KEY_FOR_SCCACHE_S3_BUCKET_V4} set -x - chmod a+x .jenkins/pytorch/macos-build.sh - unbuffer .jenkins/pytorch/macos-build.sh 2>&1 | ts + chmod a+x .ci/pytorch/macos-build.sh + unbuffer .ci/pytorch/macos-build.sh 2>&1 | ts - persist_to_workspace: root: /Users/distiller/workspace/ @@ -644,7 +644,7 @@ jobs: brew link --force libomp echo "export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname "$(which conda)")/../"}" >> "${BASH_ENV}" - .jenkins/pytorch/macos-build.sh + .ci/pytorch/macos-build.sh - when: condition: << parameters.build-generates-artifacts >> @@ -727,7 +727,7 @@ jobs: export COMMIT_MESSAGES="${COMMIT_MESSAGES//[\'\"]}" python3 -mpip install dist/*.whl - .jenkins/pytorch/macos-test.sh + .ci/pytorch/macos-test.sh - run: name: Copy files for uploading test stats command: | @@ -779,8 +779,8 @@ jobs: set -e export JOB_BASE_NAME=$CIRCLE_JOB - chmod a+x .jenkins/pytorch/macos-test.sh - unbuffer .jenkins/pytorch/macos-test.sh 2>&1 | ts + chmod a+x .ci/pytorch/macos-test.sh + unbuffer .ci/pytorch/macos-test.sh 2>&1 | ts - store_test_results: path: test/test-reports @@ -801,8 +801,8 @@ jobs: set -e export BUILD_LITE_INTERPRETER=1 export JOB_BASE_NAME=$CIRCLE_JOB - chmod a+x ${HOME}/project/.jenkins/pytorch/macos-lite-interpreter-build-test.sh - unbuffer ${HOME}/project/.jenkins/pytorch/macos-lite-interpreter-build-test.sh 2>&1 | ts + chmod a+x ${HOME}/project/.ci/pytorch/macos-lite-interpreter-build-test.sh + unbuffer ${HOME}/project/.ci/pytorch/macos-lite-interpreter-build-test.sh 2>&1 | ts - store_test_results: path: test/test-reports @@ -1151,7 +1151,7 @@ jobs: docker cp /home/circleci/project/. $id:/var/lib/jenkins/workspace - export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/build.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' + export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .ci/pytorch/build.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts @@ -1197,9 +1197,9 @@ jobs: trap "retrieve_test_reports" ERR if [[ ${BUILD_ENVIRONMENT} == *"multigpu"* ]]; then - export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/multigpu-test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' + export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .ci/pytorch/multigpu-test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' else - export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' + export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .ci/pytorch/test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' fi echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts diff --git a/.circleci/scripts/functorch_doc_push_script.sh b/.circleci/scripts/functorch_doc_push_script.sh index aed2a1c451b9f..3a688568ce6f3 100755 --- a/.circleci/scripts/functorch_doc_push_script.sh +++ b/.circleci/scripts/functorch_doc_push_script.sh @@ -7,7 +7,7 @@ sudo apt-get -y install expect-dev # This is where the local pytorch install in the docker image is located pt_checkout="/var/lib/jenkins/workspace" -source "$pt_checkout/.jenkins/pytorch/common_utils.sh" +source "$pt_checkout/.ci/pytorch/common_utils.sh" echo "functorch_doc_push_script.sh: Invoked with $*" set -ex diff --git a/.circleci/scripts/python_doc_push_script.sh b/.circleci/scripts/python_doc_push_script.sh index 07db737e0bc7e..c583cc348de4f 100755 --- a/.circleci/scripts/python_doc_push_script.sh +++ b/.circleci/scripts/python_doc_push_script.sh @@ -7,7 +7,7 @@ sudo apt-get -y install expect-dev # This is where the local pytorch install in the docker image is located pt_checkout="/var/lib/jenkins/workspace" -source "$pt_checkout/.jenkins/pytorch/common_utils.sh" +source "$pt_checkout/.ci/pytorch/common_utils.sh" echo "python_doc_push_script.sh: Invoked with $*" diff --git a/.circleci/verbatim-sources/job-specs/job-specs-custom.yml b/.circleci/verbatim-sources/job-specs/job-specs-custom.yml index 38cf856da2ecc..4726b875fd833 100644 --- a/.circleci/verbatim-sources/job-specs/job-specs-custom.yml +++ b/.circleci/verbatim-sources/job-specs/job-specs-custom.yml @@ -51,8 +51,8 @@ export AWS_SECRET_ACCESS_KEY=${CIRCLECI_AWS_SECRET_KEY_FOR_SCCACHE_S3_BUCKET_V4} set -x - chmod a+x .jenkins/pytorch/macos-build.sh - unbuffer .jenkins/pytorch/macos-build.sh 2>&1 | ts + chmod a+x .ci/pytorch/macos-build.sh + unbuffer .ci/pytorch/macos-build.sh 2>&1 | ts - persist_to_workspace: root: /Users/distiller/workspace/ @@ -87,8 +87,8 @@ export AWS_SECRET_ACCESS_KEY=${CIRCLECI_AWS_SECRET_KEY_FOR_SCCACHE_S3_BUCKET_V4} set -x - chmod a+x .jenkins/pytorch/macos-build.sh - unbuffer .jenkins/pytorch/macos-build.sh 2>&1 | ts + chmod a+x .ci/pytorch/macos-build.sh + unbuffer .ci/pytorch/macos-build.sh 2>&1 | ts - persist_to_workspace: root: /Users/distiller/workspace/ @@ -169,7 +169,7 @@ brew link --force libomp echo "export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname "$(which conda)")/../"}" >> "${BASH_ENV}" - .jenkins/pytorch/macos-build.sh + .ci/pytorch/macos-build.sh - when: condition: << parameters.build-generates-artifacts >> @@ -252,7 +252,7 @@ export COMMIT_MESSAGES="${COMMIT_MESSAGES//[\'\"]}" python3 -mpip install dist/*.whl - .jenkins/pytorch/macos-test.sh + .ci/pytorch/macos-test.sh - run: name: Copy files for uploading test stats command: | @@ -304,8 +304,8 @@ set -e export JOB_BASE_NAME=$CIRCLE_JOB - chmod a+x .jenkins/pytorch/macos-test.sh - unbuffer .jenkins/pytorch/macos-test.sh 2>&1 | ts + chmod a+x .ci/pytorch/macos-test.sh + unbuffer .ci/pytorch/macos-test.sh 2>&1 | ts - store_test_results: path: test/test-reports @@ -326,8 +326,8 @@ set -e export BUILD_LITE_INTERPRETER=1 export JOB_BASE_NAME=$CIRCLE_JOB - chmod a+x ${HOME}/project/.jenkins/pytorch/macos-lite-interpreter-build-test.sh - unbuffer ${HOME}/project/.jenkins/pytorch/macos-lite-interpreter-build-test.sh 2>&1 | ts + chmod a+x ${HOME}/project/.ci/pytorch/macos-lite-interpreter-build-test.sh + unbuffer ${HOME}/project/.ci/pytorch/macos-lite-interpreter-build-test.sh 2>&1 | ts - store_test_results: path: test/test-reports @@ -676,7 +676,7 @@ docker cp /home/circleci/project/. $id:/var/lib/jenkins/workspace - export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/build.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' + export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .ci/pytorch/build.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts @@ -722,9 +722,9 @@ trap "retrieve_test_reports" ERR if [[ ${BUILD_ENVIRONMENT} == *"multigpu"* ]]; then - export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/multigpu-test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' + export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .ci/pytorch/multigpu-test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' else - export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .jenkins/pytorch/test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' + export COMMAND='((echo "sudo chown -R jenkins workspace && cd workspace && .ci/pytorch/test.sh") | docker exec -u jenkins -i "$id" bash) 2>&1' fi echo ${COMMAND} > ./command.sh && unbuffer bash ./command.sh | ts diff --git a/.github/actions/build-android/action.yml b/.github/actions/build-android/action.yml index b5f2018831cea..3bfe28e4c7bbf 100644 --- a/.github/actions/build-android/action.yml +++ b/.github/actions/build-android/action.yml @@ -68,7 +68,7 @@ runs: ) git submodule sync && git submodule update -q --init --recursive --depth 1 docker cp "${GITHUB_WORKSPACE}/." "${container_name}:/var/lib/jenkins/workspace" - (echo "sudo chown -R jenkins . && .jenkins/pytorch/build.sh && find ${BUILD_ROOT} -type f -name "*.a" -or -name "*.o" -delete" | docker exec -u jenkins -i "${container_name}" bash) 2>&1 + (echo "sudo chown -R jenkins . && .ci/pytorch/build.sh && find ${BUILD_ROOT} -type f -name "*.a" -or -name "*.o" -delete" | docker exec -u jenkins -i "${container_name}" bash) 2>&1 # Copy install binaries back mkdir -p "${GITHUB_WORKSPACE}/build_android_install_${MATRIX_ARCH}" diff --git a/.github/merge_rules.yaml b/.github/merge_rules.yaml index 7e775da32ead6..bf499ba8d117f 100644 --- a/.github/merge_rules.yaml +++ b/.github/merge_rules.yaml @@ -1,7 +1,7 @@ - name: ONNX exporter patterns: - - .jenkins/caffe2/* - - .jenkins/onnx/* + - .ci/caffe2/* + - .ci/onnx/* - aten/src/ATen/core/interned_strings.h - docs/source/onnx.rst - docs/source/onnx* @@ -52,7 +52,7 @@ patterns: - .github/** - .circleci/** - - .jenkins/** + - .ci/** - scripts/** - tools/** approved_by: diff --git a/.github/workflows/_bazel-build-test.yml b/.github/workflows/_bazel-build-test.yml index 24fed4ee7f019..76911c20600de 100644 --- a/.github/workflows/_bazel-build-test.yml +++ b/.github/workflows/_bazel-build-test.yml @@ -101,7 +101,7 @@ jobs: -w /var/lib/jenkins/workspace \ "${DOCKER_IMAGE}" ) - docker exec -t "${container_name}" sh -c 'sudo chown -R jenkins . && sudo chown -R jenkins /dev && .jenkins/pytorch/build.sh' + docker exec -t "${container_name}" sh -c 'sudo chown -R jenkins . && sudo chown -R jenkins /dev && .ci/pytorch/build.sh' # !{{ common_android.upload_android_binary_size("", "")}} - name: Test @@ -162,7 +162,7 @@ jobs: -w /var/lib/jenkins/workspace \ "${DOCKER_IMAGE}" ) - docker exec -t "${container_name}" sh -c 'sudo chown -R jenkins . && sudo chown -R jenkins /dev && .jenkins/pytorch/test.sh && cp -Lr ./bazel-testlogs ./test/test-reports' + docker exec -t "${container_name}" sh -c 'sudo chown -R jenkins . && sudo chown -R jenkins /dev && .ci/pytorch/test.sh && cp -Lr ./bazel-testlogs ./test/test-reports' - name: Print remaining test logs shell: bash diff --git a/.github/workflows/_linux-build.yml b/.github/workflows/_linux-build.yml index be3d2ce98c030..a1b55ad6b893e 100644 --- a/.github/workflows/_linux-build.yml +++ b/.github/workflows/_linux-build.yml @@ -158,7 +158,7 @@ jobs: -w /var/lib/jenkins/workspace \ "${DOCKER_IMAGE}" ) - docker exec -t "${container_name}" sh -c '.jenkins/pytorch/build.sh' + docker exec -t "${container_name}" sh -c '.ci/pytorch/build.sh' - name: Archive artifacts into zip if: inputs.build-generates-artifacts && steps.build.outcome != 'skipped' diff --git a/.github/workflows/_linux-test.yml b/.github/workflows/_linux-test.yml index aa09c9bb39bce..ac5e271f2f8e7 100644 --- a/.github/workflows/_linux-test.yml +++ b/.github/workflows/_linux-test.yml @@ -147,11 +147,11 @@ jobs: set -x if [[ $TEST_CONFIG == 'multigpu' ]]; then - TEST_COMMAND=.jenkins/pytorch/multigpu-test.sh + TEST_COMMAND=.ci/pytorch/multigpu-test.sh elif [[ $BUILD_ENVIRONMENT == *onnx* ]]; then - TEST_COMMAND=.jenkins/onnx/test.sh + TEST_COMMAND=.ci/onnx/test.sh else - TEST_COMMAND=.jenkins/pytorch/test.sh + TEST_COMMAND=.ci/pytorch/test.sh fi COMMIT_MESSAGES=$(git cherry -v "origin/${GIT_DEFAULT_BRANCH:-master}") diff --git a/.github/workflows/_mac-build.yml b/.github/workflows/_mac-build.yml index 1dfcc8c1fb2d4..f5f66ae5129bf 100644 --- a/.github/workflows/_mac-build.yml +++ b/.github/workflows/_mac-build.yml @@ -146,7 +146,7 @@ jobs: OUR_GITHUB_JOB_ID: ${{ steps.get-job-id.outputs.job-id }} run: | echo "CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname "$(which conda)")/../"}" >> "${GITHUB_ENV}" - ${CONDA_RUN} .jenkins/pytorch/macos-build.sh + ${CONDA_RUN} .ci/pytorch/macos-build.sh - name: Archive artifacts into zip if: inputs.build-generates-artifacts && steps.build.outcome != 'skipped' diff --git a/.github/workflows/_mac-test.yml b/.github/workflows/_mac-test.yml index eab00071256a0..c36151eeaca72 100644 --- a/.github/workflows/_mac-test.yml +++ b/.github/workflows/_mac-test.yml @@ -166,7 +166,7 @@ jobs: arch ${CONDA_RUN} python3 -mpip install --no-index --no-deps $(echo dist/*.whl) - ${CONDA_RUN} .jenkins/pytorch/macos-test.sh + ${CONDA_RUN} .ci/pytorch/macos-test.sh - name: Print remaining test logs shell: bash diff --git a/.github/workflows/_rocm-test.yml b/.github/workflows/_rocm-test.yml index 9e15d032b67e5..5f8f0d713d7da 100644 --- a/.github/workflows/_rocm-test.yml +++ b/.github/workflows/_rocm-test.yml @@ -139,11 +139,11 @@ jobs: set -x if [[ $TEST_CONFIG == 'multigpu' ]]; then - TEST_COMMAND=.jenkins/pytorch/multigpu-test.sh + TEST_COMMAND=.ci/pytorch/multigpu-test.sh elif [[ $BUILD_ENVIRONMENT == *onnx* ]]; then - TEST_COMMAND=.jenkins/caffe2/test.sh + TEST_COMMAND=.ci/caffe2/test.sh else - TEST_COMMAND=.jenkins/pytorch/test.sh + TEST_COMMAND=.ci/pytorch/test.sh fi COMMIT_MESSAGES=$(git cherry -v "origin/${GIT_DEFAULT_BRANCH:-master}") diff --git a/.github/workflows/_win-build.yml b/.github/workflows/_win-build.yml index e6aaeec8aa551..21d2c3a2e305f 100644 --- a/.github/workflows/_win-build.yml +++ b/.github/workflows/_win-build.yml @@ -122,7 +122,7 @@ jobs: USE_CUDA: ${{ inputs.cuda-version != 'cpu' && '1' || '0' }} OUR_GITHUB_JOB_ID: ${{ steps.get-job-id.outputs.job-id }} run: | - .jenkins/pytorch/win-build.sh + .ci/pytorch/win-build.sh # Upload to github so that people can click and download artifacts - name: Upload artifacts to s3 diff --git a/.github/workflows/_win-test.yml b/.github/workflows/_win-test.yml index e62c9a381a303..7c66392690679 100644 --- a/.github/workflows/_win-test.yml +++ b/.github/workflows/_win-test.yml @@ -151,7 +151,7 @@ jobs: export COMMIT_MESSAGES="${COMMIT_MESSAGES//[\'\"]}" export PR_BODY="${PR_BODY//[\'\"]}" - .jenkins/pytorch/win-test.sh + .ci/pytorch/win-test.sh - name: Print remaining test logs shell: bash diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index f40f610fa2ade..59c2d871e31af 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -41,7 +41,7 @@ jobs: cp -r "$PWD" "/tmp/$PT_RELEASE_NAME" mv "/tmp/$PT_RELEASE_NAME" . # Cleanup - rm -rf "$PT_RELEASE_NAME"/{.circleci,.jenkins} + rm -rf "$PT_RELEASE_NAME"/{.circleci,.ci} find "$PT_RELEASE_NAME" -name '.git*' -exec rm -rv {} \; || true # Create archive tar -czf "$PT_RELEASE_FILE" "$PT_RELEASE_NAME" diff --git a/.lintrunner.toml b/.lintrunner.toml index 6356a5b5bad3e..fdb7b74aa77db 100644 --- a/.lintrunner.toml +++ b/.lintrunner.toml @@ -680,7 +680,7 @@ init_command = [ [[linter]] code = 'SHELLCHECK' include_patterns = [ - '.jenkins/pytorch/**/*.sh' + '.ci/pytorch/**/*.sh' ] command = [ 'python3', diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a38b0ad605133..7afb4d5cce90a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -958,8 +958,8 @@ than Linux, which are worth keeping in mind when fixing these problems. transitive dependencies can be used to fulfill unresolved symbols.) 3. If you have a Windows box (we have a few on EC2 which you can request access to) and - you want to run the build, the easiest way is to just run `.jenkins/pytorch/win-build.sh`. - If you need to rebuild, run `REBUILD=1 .jenkins/pytorch/win-build.sh` (this will avoid + you want to run the build, the easiest way is to just run `.ci/pytorch/win-build.sh`. + If you need to rebuild, run `REBUILD=1 .ci/pytorch/win-build.sh` (this will avoid blowing away your Conda environment.) Even if you don't know anything about MSVC, you can use cmake to build simple programs on diff --git a/README.md b/README.md index fceaef190805a..eeaa2599f3623 100644 --- a/README.md +++ b/README.md @@ -287,9 +287,9 @@ Currently, VS 2017 / 2019, and Ninja are supported as the generator of CMake. If
If Ninja is selected as the generator, the latest MSVC will get selected as the underlying toolchain. Additional libraries such as -[Magma](https://developer.nvidia.com/magma), [oneDNN, a.k.a MKLDNN or DNNL](https://github.com/oneapi-src/oneDNN), and [Sccache](https://github.com/mozilla/sccache) are often needed. Please refer to the [installation-helper](https://github.com/pytorch/pytorch/tree/master/.jenkins/pytorch/win-test-helpers/installation-helpers) to install them. +[Magma](https://developer.nvidia.com/magma), [oneDNN, a.k.a MKLDNN or DNNL](https://github.com/oneapi-src/oneDNN), and [Sccache](https://github.com/mozilla/sccache) are often needed. Please refer to the [installation-helper](https://github.com/pytorch/pytorch/tree/master/.ci/pytorch/win-test-helpers/installation-helpers) to install them. -You can refer to the [build_pytorch.bat](https://github.com/pytorch/pytorch/blob/master/.jenkins/pytorch/win-test-helpers/build_pytorch.bat) script for some other environment variables configurations +You can refer to the [build_pytorch.bat](https://github.com/pytorch/pytorch/blob/master/.ci/pytorch/win-test-helpers/build_pytorch.bat) script for some other environment variables configurations ```cmd diff --git a/scripts/release_notes/commitlist.py b/scripts/release_notes/commitlist.py index 5529a2f2a9d5f..f130ec3564244 100644 --- a/scripts/release_notes/commitlist.py +++ b/scripts/release_notes/commitlist.py @@ -143,7 +143,7 @@ def categorize(features): files_changed = features['files_changed'] for file in files_changed: file_lowercase = file.lower() - if CommitList.keywordInFile(file, ['docker/', '.circleci', '.github', '.jenkins', '.azure_pipelines']): + if CommitList.keywordInFile(file, ['docker/', '.circleci', '.github', '.jenkins', '.ci', '.azure_pipelines']): category = 'releng' break # datapipe(s), torch/utils/data, test_{dataloader, datapipe} diff --git a/test/mobile/lightweight_dispatch/build.sh b/test/mobile/lightweight_dispatch/build.sh index b478f048ff8ed..7e062a89ea634 100755 --- a/test/mobile/lightweight_dispatch/build.sh +++ b/test/mobile/lightweight_dispatch/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This script should be called from .jenkins/pytorch/build.sh. Assuming we are at pytorch source root directory. +# This script should be called from .ci/pytorch/build.sh. Assuming we are at pytorch source root directory. # Required environment variable: $BUILD_ENVIRONMENT # (This is set by default in the Docker images we build, so you don't diff --git a/test/run_test.py b/test/run_test.py index 3fb823ed316b7..02b9884f103ca 100755 --- a/test/run_test.py +++ b/test/run_test.py @@ -52,7 +52,7 @@ # Note [ROCm parallel CI testing] # https://github.com/pytorch/pytorch/pull/85770 added file-granularity parallel testing. -# In .jenkins/pytorch/test.sh, TEST_CONFIG == "default", CUDA and HIP_VISIBLE_DEVICES is set to 0. +# In .ci/pytorch/test.sh, TEST_CONFIG == "default", CUDA and HIP_VISIBLE_DEVICES is set to 0. # This results in multiple test files sharing the same GPU. # This should be a supported use case for ROCm, but it exposed issues in the kernel driver resulting in hangs. # See https://github.com/pytorch/pytorch/issues/90940. diff --git a/test/test_determination.py b/test/test_determination.py index 3de8f1cfc4e26..3a08b8a421198 100644 --- a/test/test_determination.py +++ b/test/test_determination.py @@ -43,7 +43,7 @@ def test_target_det_list_is_sorted(self): def test_config_change_only(self): """CI configs trigger all tests""" self.assertEqual( - self.determined_tests([".jenkins/pytorch/test.sh"]), self.TESTS + self.determined_tests([".ci/pytorch/test.sh"]), self.TESTS ) def test_run_test(self): diff --git a/tools/testing/modulefinder_determinator.py b/tools/testing/modulefinder_determinator.py index dd4e4cf5c6df8..116517091b017 100644 --- a/tools/testing/modulefinder_determinator.py +++ b/tools/testing/modulefinder_determinator.py @@ -113,7 +113,7 @@ def test_impact_of_file(filename: str) -> str: CI - CI configuration files """ parts = filename.split(os.sep) - if parts[0] in [".jenkins", ".circleci"]: + if parts[0] in [".jenkins", ".circleci", ".ci"]: return "CI" if parts[0] in ["docs", "scripts", "CODEOWNERS", "README.md"]: return "NONE"