diff --git a/.circleci/docker/README.md b/.ci/docker/README.md similarity index 100% rename from .circleci/docker/README.md rename to .ci/docker/README.md diff --git a/.circleci/docker/android/AndroidManifest.xml b/.ci/docker/android/AndroidManifest.xml similarity index 100% rename from .circleci/docker/android/AndroidManifest.xml rename to .ci/docker/android/AndroidManifest.xml diff --git a/.circleci/docker/android/build.gradle b/.ci/docker/android/build.gradle similarity index 100% rename from .circleci/docker/android/build.gradle rename to .ci/docker/android/build.gradle diff --git a/.circleci/docker/build.sh b/.ci/docker/build.sh similarity index 100% rename from .circleci/docker/build.sh rename to .ci/docker/build.sh diff --git a/.circleci/docker/build_docker.sh b/.ci/docker/build_docker.sh similarity index 100% rename from .circleci/docker/build_docker.sh rename to .ci/docker/build_docker.sh diff --git a/.circleci/docker/centos-rocm/Dockerfile b/.ci/docker/centos-rocm/Dockerfile similarity index 100% rename from .circleci/docker/centos-rocm/Dockerfile rename to .ci/docker/centos-rocm/Dockerfile diff --git a/.circleci/docker/common/install_android.sh b/.ci/docker/common/install_android.sh similarity index 100% rename from .circleci/docker/common/install_android.sh rename to .ci/docker/common/install_android.sh diff --git a/.circleci/docker/common/install_base.sh b/.ci/docker/common/install_base.sh similarity index 100% rename from .circleci/docker/common/install_base.sh rename to .ci/docker/common/install_base.sh diff --git a/.circleci/docker/common/install_cache.sh b/.ci/docker/common/install_cache.sh similarity index 100% rename from .circleci/docker/common/install_cache.sh rename to .ci/docker/common/install_cache.sh diff --git a/.circleci/docker/common/install_clang.sh b/.ci/docker/common/install_clang.sh similarity index 100% rename from .circleci/docker/common/install_clang.sh rename to .ci/docker/common/install_clang.sh diff --git a/.circleci/docker/common/install_cmake.sh b/.ci/docker/common/install_cmake.sh similarity index 100% rename from .circleci/docker/common/install_cmake.sh rename to .ci/docker/common/install_cmake.sh diff --git a/.circleci/docker/common/install_conda.sh b/.ci/docker/common/install_conda.sh similarity index 100% rename from .circleci/docker/common/install_conda.sh rename to .ci/docker/common/install_conda.sh diff --git a/.circleci/docker/common/install_cudnn.sh b/.ci/docker/common/install_cudnn.sh similarity index 100% rename from .circleci/docker/common/install_cudnn.sh rename to .ci/docker/common/install_cudnn.sh diff --git a/.circleci/docker/common/install_db.sh b/.ci/docker/common/install_db.sh similarity index 100% rename from .circleci/docker/common/install_db.sh rename to .ci/docker/common/install_db.sh diff --git a/.circleci/docker/common/install_devtoolset.sh b/.ci/docker/common/install_devtoolset.sh similarity index 100% rename from .circleci/docker/common/install_devtoolset.sh rename to .ci/docker/common/install_devtoolset.sh diff --git a/.circleci/docker/common/install_docs_reqs.sh b/.ci/docker/common/install_docs_reqs.sh similarity index 100% rename from .circleci/docker/common/install_docs_reqs.sh rename to .ci/docker/common/install_docs_reqs.sh diff --git a/.circleci/docker/common/install_gcc.sh b/.ci/docker/common/install_gcc.sh similarity index 100% rename from .circleci/docker/common/install_gcc.sh rename to .ci/docker/common/install_gcc.sh diff --git a/.circleci/docker/common/install_glibc.sh b/.ci/docker/common/install_glibc.sh similarity index 100% rename from .circleci/docker/common/install_glibc.sh rename to .ci/docker/common/install_glibc.sh diff --git a/.circleci/docker/common/install_jni.sh b/.ci/docker/common/install_jni.sh similarity index 100% rename from .circleci/docker/common/install_jni.sh rename to .ci/docker/common/install_jni.sh diff --git a/.circleci/docker/common/install_lcov.sh b/.ci/docker/common/install_lcov.sh similarity index 100% rename from .circleci/docker/common/install_lcov.sh rename to .ci/docker/common/install_lcov.sh diff --git a/.circleci/docker/common/install_ninja.sh b/.ci/docker/common/install_ninja.sh similarity index 100% rename from .circleci/docker/common/install_ninja.sh rename to .ci/docker/common/install_ninja.sh diff --git a/.circleci/docker/common/install_openmpi.sh b/.ci/docker/common/install_openmpi.sh similarity index 100% rename from .circleci/docker/common/install_openmpi.sh rename to .ci/docker/common/install_openmpi.sh diff --git a/.circleci/docker/common/install_openssl.sh b/.ci/docker/common/install_openssl.sh similarity index 100% rename from .circleci/docker/common/install_openssl.sh rename to .ci/docker/common/install_openssl.sh diff --git a/.circleci/docker/common/install_protobuf.sh b/.ci/docker/common/install_protobuf.sh similarity index 100% rename from .circleci/docker/common/install_protobuf.sh rename to .ci/docker/common/install_protobuf.sh diff --git a/.circleci/docker/common/install_rocm.sh b/.ci/docker/common/install_rocm.sh similarity index 100% rename from .circleci/docker/common/install_rocm.sh rename to .ci/docker/common/install_rocm.sh diff --git a/.circleci/docker/common/install_rocm_magma.sh b/.ci/docker/common/install_rocm_magma.sh similarity index 100% rename from .circleci/docker/common/install_rocm_magma.sh rename to .ci/docker/common/install_rocm_magma.sh diff --git a/.circleci/docker/common/install_swiftshader.sh b/.ci/docker/common/install_swiftshader.sh similarity index 100% rename from .circleci/docker/common/install_swiftshader.sh rename to .ci/docker/common/install_swiftshader.sh diff --git a/.circleci/docker/common/install_thrift.sh b/.ci/docker/common/install_thrift.sh similarity index 100% rename from .circleci/docker/common/install_thrift.sh rename to .ci/docker/common/install_thrift.sh diff --git a/.circleci/docker/common/install_ucc.sh b/.ci/docker/common/install_ucc.sh similarity index 100% rename from .circleci/docker/common/install_ucc.sh rename to .ci/docker/common/install_ucc.sh diff --git a/.circleci/docker/common/install_user.sh b/.ci/docker/common/install_user.sh similarity index 100% rename from .circleci/docker/common/install_user.sh rename to .ci/docker/common/install_user.sh diff --git a/.circleci/docker/common/install_vision.sh b/.ci/docker/common/install_vision.sh similarity index 100% rename from .circleci/docker/common/install_vision.sh rename to .ci/docker/common/install_vision.sh diff --git a/.circleci/docker/common/install_vulkan_sdk.sh b/.ci/docker/common/install_vulkan_sdk.sh similarity index 100% rename from .circleci/docker/common/install_vulkan_sdk.sh rename to .ci/docker/common/install_vulkan_sdk.sh diff --git a/.circleci/docker/java/jni.h b/.ci/docker/java/jni.h similarity index 100% rename from .circleci/docker/java/jni.h rename to .ci/docker/java/jni.h diff --git a/.circleci/docker/requirements-ci.txt b/.ci/docker/requirements-ci.txt similarity index 100% rename from .circleci/docker/requirements-ci.txt rename to .ci/docker/requirements-ci.txt diff --git a/.circleci/docker/ubuntu-cuda/Dockerfile b/.ci/docker/ubuntu-cuda/Dockerfile similarity index 100% rename from .circleci/docker/ubuntu-cuda/Dockerfile rename to .ci/docker/ubuntu-cuda/Dockerfile diff --git a/.circleci/docker/ubuntu-rocm/.gitignore b/.ci/docker/ubuntu-rocm/.gitignore similarity index 100% rename from .circleci/docker/ubuntu-rocm/.gitignore rename to .ci/docker/ubuntu-rocm/.gitignore diff --git a/.circleci/docker/ubuntu-rocm/Dockerfile b/.ci/docker/ubuntu-rocm/Dockerfile similarity index 100% rename from .circleci/docker/ubuntu-rocm/Dockerfile rename to .ci/docker/ubuntu-rocm/Dockerfile diff --git a/.circleci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile similarity index 100% rename from .circleci/docker/ubuntu/Dockerfile rename to .ci/docker/ubuntu/Dockerfile diff --git a/.ci/pytorch/README.md b/.ci/pytorch/README.md index 9fd68ecf7f15..15e3a58dbc90 100644 --- a/.ci/pytorch/README.md +++ b/.ci/pytorch/README.md @@ -10,7 +10,7 @@ it is very easy to run these tests yourself: ``registry.pytorch.org/pytorch/pytorch-$BUILD_ENVIRONMENT:$DOCKER_VERSION``, where ``$BUILD_ENVIRONMENT`` is one of the build environments enumerated in - [pytorch-dockerfiles](https://github.com/pytorch/pytorch/blob/master/.circleci/docker/build.sh). The dockerfile used by jenkins can be found under the `.circle` [directory](https://github.com/pytorch/pytorch/blob/master/.circleci/docker) + [pytorch-dockerfiles](https://github.com/pytorch/pytorch/blob/master/.ci/docker/build.sh). The dockerfile used by jenkins can be found under the `.ci` [directory](https://github.com/pytorch/pytorch/blob/master/.ci/docker) 2. Run ``docker run -it -u jenkins $DOCKER_IMAGE``, clone PyTorch and run one of the scripts in this directory. diff --git a/.circleci/config.yml b/.circleci/config.yml index 836b1f8b6850..be987a8518c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ commands: - run: name: "Calculate docker image hash" command: | - DOCKER_TAG=$(git rev-parse HEAD:.circleci/docker) + DOCKER_TAG=$(git rev-parse HEAD:.ci/docker) echo "DOCKER_TAG=${DOCKER_TAG}" >> "${BASH_ENV}" designate_upload_channel: @@ -1322,12 +1322,12 @@ jobs: exit 0 fi # Covers the case where a previous tag doesn't exist for the tree - # this is only really applicable on trees that don't have `.circleci/docker` at its merge base, i.e. nightly - if ! git rev-parse "$(git merge-base HEAD << pipeline.git.base_revision >>):.circleci/docker"; then - echo "Directory '.circleci/docker' not found in tree << pipeline.git.base_revision >>, you should probably rebase onto a more recent commit" + # this is only really applicable on trees that don't have `.ci/docker` at its merge base, i.e. nightly + if ! git rev-parse "$(git merge-base HEAD << pipeline.git.base_revision >>):.ci/docker"; then + echo "Directory '.ci/docker' not found in tree << pipeline.git.base_revision >>, you should probably rebase onto a more recent commit" exit 1 fi - PREVIOUS_DOCKER_TAG=$(git rev-parse "$(git merge-base HEAD << pipeline.git.base_revision >>):.circleci/docker") + PREVIOUS_DOCKER_TAG=$(git rev-parse "$(git merge-base HEAD << pipeline.git.base_revision >>):ci/docker") # If no image exists but the hash is the same as the previous hash then we should error out here if [[ "${PREVIOUS_DOCKER_TAG}" = "${DOCKER_TAG}" ]]; then echo "ERROR: Something has gone wrong and the previous image isn't available for the merge-base of your branch" @@ -1342,7 +1342,7 @@ jobs: export AWS_ACCESS_KEY_ID=${CIRCLECI_AWS_ACCESS_KEY_FOR_DOCKER_BUILDER_V1} export AWS_SECRET_ACCESS_KEY=${CIRCLECI_AWS_SECRET_KEY_FOR_DOCKER_BUILDER_V1} set -x - cd .circleci/docker && ./build_docker.sh + cd .ci/docker && ./build_docker.sh ############################################################################## # Workflows ############################################################################## diff --git a/.circleci/verbatim-sources/commands.yml b/.circleci/verbatim-sources/commands.yml index 1263c4996c62..edc8f8ece1a6 100644 --- a/.circleci/verbatim-sources/commands.yml +++ b/.circleci/verbatim-sources/commands.yml @@ -6,7 +6,7 @@ commands: - run: name: "Calculate docker image hash" command: | - DOCKER_TAG=$(git rev-parse HEAD:.circleci/docker) + DOCKER_TAG=$(git rev-parse HEAD:.ci/docker) echo "DOCKER_TAG=${DOCKER_TAG}" >> "${BASH_ENV}" designate_upload_channel: diff --git a/.circleci/verbatim-sources/job-specs/docker_jobs.yml b/.circleci/verbatim-sources/job-specs/docker_jobs.yml index 843986367c22..a4abd92fcac8 100644 --- a/.circleci/verbatim-sources/job-specs/docker_jobs.yml +++ b/.circleci/verbatim-sources/job-specs/docker_jobs.yml @@ -33,12 +33,12 @@ exit 0 fi # Covers the case where a previous tag doesn't exist for the tree - # this is only really applicable on trees that don't have `.circleci/docker` at its merge base, i.e. nightly - if ! git rev-parse "$(git merge-base HEAD << pipeline.git.base_revision >>):.circleci/docker"; then - echo "Directory '.circleci/docker' not found in tree << pipeline.git.base_revision >>, you should probably rebase onto a more recent commit" + # this is only really applicable on trees that don't have `.ci/docker` at its merge base, i.e. nightly + if ! git rev-parse "$(git merge-base HEAD << pipeline.git.base_revision >>):.ci/docker"; then + echo "Directory '.ci/docker' not found in tree << pipeline.git.base_revision >>, you should probably rebase onto a more recent commit" exit 1 fi - PREVIOUS_DOCKER_TAG=$(git rev-parse "$(git merge-base HEAD << pipeline.git.base_revision >>):.circleci/docker") + PREVIOUS_DOCKER_TAG=$(git rev-parse "$(git merge-base HEAD << pipeline.git.base_revision >>):ci/docker") # If no image exists but the hash is the same as the previous hash then we should error out here if [[ "${PREVIOUS_DOCKER_TAG}" = "${DOCKER_TAG}" ]]; then echo "ERROR: Something has gone wrong and the previous image isn't available for the merge-base of your branch" @@ -53,4 +53,4 @@ export AWS_ACCESS_KEY_ID=${CIRCLECI_AWS_ACCESS_KEY_FOR_DOCKER_BUILDER_V1} export AWS_SECRET_ACCESS_KEY=${CIRCLECI_AWS_SECRET_KEY_FOR_DOCKER_BUILDER_V1} set -x - cd .circleci/docker && ./build_docker.sh + cd .ci/docker && ./build_docker.sh diff --git a/.github/actions/calculate-docker-image/action.yml b/.github/actions/calculate-docker-image/action.yml index 760e2936957c..e1ffc1ee66de 100644 --- a/.github/actions/calculate-docker-image/action.yml +++ b/.github/actions/calculate-docker-image/action.yml @@ -43,11 +43,11 @@ runs: run: | if [ -n "${IS_XLA}" ]; then echo "XLA workflow uses pre-built test image at ${XLA_IMAGE_TAG}" - DOCKER_TAG=$(git rev-parse HEAD:.circleci/docker) + DOCKER_TAG=$(git rev-parse HEAD:.ci/docker) echo "docker-tag=${DOCKER_TAG}" >> "${GITHUB_OUTPUT}" echo "docker-image=${DOCKER_IMAGE_BASE}:${XLA_IMAGE_TAG}" >> "${GITHUB_OUTPUT}" else - DOCKER_TAG=$(git rev-parse HEAD:.circleci/docker) + DOCKER_TAG=$(git rev-parse HEAD:.ci/docker) echo "docker-tag=${DOCKER_TAG}" >> "${GITHUB_OUTPUT}" echo "docker-image=${DOCKER_IMAGE_BASE}:${DOCKER_TAG}" >> "${GITHUB_OUTPUT}" fi @@ -75,12 +75,12 @@ runs: MERGE_BASE=$(git merge-base HEAD "$BASE_REVISION") fi # Covers the case where a previous tag doesn't exist for the tree - # this is only really applicable on trees that don't have `.circleci/docker` at its merge base, i.e. nightly - if ! git rev-parse "$MERGE_BASE:.circleci/docker"; then - echo "Directory '.circleci/docker' not found in commit $MERGE_BASE, you should probably rebase onto a more recent commit" + # this is only really applicable on trees that don't have `.ci/docker` at its merge base, i.e. nightly + if ! git rev-parse "$MERGE_BASE:.ci/docker"; then + echo "Directory '.ci/docker' not found in commit $MERGE_BASE, you should probably rebase onto a more recent commit" exit 1 fi - PREVIOUS_DOCKER_TAG=$(git rev-parse "$MERGE_BASE:.circleci/docker") + PREVIOUS_DOCKER_TAG=$(git rev-parse "$MERGE_BASE:.ci/docker") # If no image exists but the hash is the same as the previous hash then we should error out here if [[ "${PREVIOUS_DOCKER_TAG}" = "${DOCKER_TAG}" ]]; then echo "WARNING: Something has gone wrong and the previous image isn't available for the merge-base of your branch" @@ -103,7 +103,7 @@ runs: # Skip push if we don't need it, or if specified in the inputs DOCKER_SKIP_PUSH: ${{ steps.check.outputs.skip_push || inputs.skip_push }} DOCKER_TAG: ${{ steps.calculate-tag.outputs.docker-tag }} - working-directory: .circleci/docker + working-directory: .ci/docker shell: bash run: | ./build_docker.sh diff --git a/.github/requirements-gha-cache.txt b/.github/requirements-gha-cache.txt index 7b45c61c1815..300d5a458ec4 100644 --- a/.github/requirements-gha-cache.txt +++ b/.github/requirements-gha-cache.txt @@ -4,7 +4,7 @@ # docs/requirements.txt # docs/cpp/requirements.txt # functorch/docs/requirements.txt -# .circleci/docker/requirements-ci.txt +# .ci/docker/requirements-ci.txt boto3==1.19.12 jinja2==3.0.1 lintrunner==0.9.2 diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml index 592566f38617..e7177e938aeb 100644 --- a/.github/workflows/docker-builds.yml +++ b/.github/workflows/docker-builds.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: pull_request: paths: - - .circleci/docker/** + - .ci/docker/** - .github/workflows/docker-builds.yml push: branches: @@ -13,7 +13,7 @@ on: - release/* - landchecks/* paths: - - .circleci/docker/** + - .ci/docker/** - .github/workflows/docker-builds.yml schedule: - cron: 1 3 * * 3 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 330780677769..f3776b9b54eb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -249,11 +249,11 @@ jobs: cache-dependency-path: | **/requirements.txt **/requirements-flake8.txt - **/.circleci/docker/requirements-ci.txt + **/.ci/docker/requirements-ci.txt **/.github/requirements-gha-cache.txt - name: Install dependencies # mypy and boto3 versions copied from - # .circleci/docker/common/install_conda.sh + # .ci/docker/common/install_conda.sh run: | set -eux pip install -r requirements.txt diff --git a/.github/workflows/update-viablestrict.yml b/.github/workflows/update-viablestrict.yml index 12bf4e271f92..3c95bed5cccc 100644 --- a/.github/workflows/update-viablestrict.yml +++ b/.github/workflows/update-viablestrict.yml @@ -27,7 +27,7 @@ jobs: check-latest: false cache: pip cache-dependency-path: | - **/.circleci/docker/requirements-ci.txt + **/.ci/docker/requirements-ci.txt **/.github/requirements-gha-cache.txt - name: Install Python Packages diff --git a/CODEOWNERS b/CODEOWNERS index 1dcdfb161b74..a4e0face6f12 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -64,7 +64,7 @@ nn/qat/ @jerryzh168 /test/onnx/ @bowenbao @abock # Docker -/.circleci/docker/ @jeffdaily +/.ci/docker/ @jeffdaily # Github Actions # This list is for people wanting to be notified every time there's a change diff --git a/mypy_plugins/check_mypy_version.py b/mypy_plugins/check_mypy_version.py index 0110232e566d..7ef19ef22b0b 100644 --- a/mypy_plugins/check_mypy_version.py +++ b/mypy_plugins/check_mypy_version.py @@ -9,7 +9,7 @@ def get_correct_mypy_version(): # there's probably a more elegant way to do this match, = re.finditer( r'mypy==(\d+(?:\.\d+)*)', - (Path(__file__).parent.parent / '.circleci' / 'docker' / 'requirements-ci.txt').read_text(), + (Path(__file__).parent.parent / '.ci' / 'docker' / 'requirements-ci.txt').read_text(), ) version, = match.groups() return version