From 0c4baeb1f480b3f3401bab80e8a89c6e9e457f28 Mon Sep 17 00:00:00 2001 From: vmoens Date: Mon, 8 Jan 2024 16:26:27 +0000 Subject: [PATCH 1/2] amend --- .github/scripts/m1_script.sh | 4 +++- .github/scripts/pre_build_script_m1.sh | 3 --- .github/workflows/build-wheels-m1.yml | 1 - .github/workflows/wheels.yml | 8 ++++---- setup.py | 2 +- version.txt | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 .github/scripts/pre_build_script_m1.sh diff --git a/.github/scripts/m1_script.sh b/.github/scripts/m1_script.sh index 4226b2beb32..ac0f1bd68d6 100644 --- a/.github/scripts/m1_script.sh +++ b/.github/scripts/m1_script.sh @@ -1,3 +1,5 @@ #!/bin/bash -export BUILD_VERSION=0.2.1 +export BUILD_VERSION=0.3.0 + +python3 -mpip install git+https://github.com/pytorch/tensordict.git diff --git a/.github/scripts/pre_build_script_m1.sh b/.github/scripts/pre_build_script_m1.sh deleted file mode 100644 index 8f98c05c9a8..00000000000 --- a/.github/scripts/pre_build_script_m1.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -python3 -mpip install git+https://github.com/pytorch/tensordict.git diff --git a/.github/workflows/build-wheels-m1.yml b/.github/workflows/build-wheels-m1.yml index 6ef2cc1ecd0..5601a9f8485 100644 --- a/.github/workflows/build-wheels-m1.yml +++ b/.github/workflows/build-wheels-m1.yml @@ -31,7 +31,6 @@ jobs: test-infra-repository: pytorch/test-infra test-infra-ref: main build-matrix: ${{ needs.generate-matrix.outputs.matrix }} - pre-script: .github/scripts/pre_build_script_m1.sh post-script: "" package-name: torchrl runner-type: macos-m1-12 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 74bf3fe509a..428997ba3e8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -4,7 +4,7 @@ on: types: [opened, synchronize, reopened] push: branches: - - release/0.2.1 + - release/0.3.0 concurrency: # Documentation suggests ${{ github.head_ref }}, but that's only available on pull_request/pull_request_target triggers, so using ${{ github.ref }}. @@ -32,7 +32,7 @@ jobs: run: | export PATH="/opt/python/${{ matrix.python_version[1] }}/bin:$PATH" python3 -mpip install wheel - BUILD_VERSION=0.2.1 python3 setup.py bdist_wheel + BUILD_VERSION=0.3.0 python3 setup.py bdist_wheel # NB: wheels have the linux_x86_64 tag so we rename to manylinux1 # find . -name 'dist/*whl' -exec bash -c ' mv $0 ${0/linux/manylinux1}' {} \; # pytorch/pytorch binaries are also manylinux_2_17 compliant but they @@ -72,7 +72,7 @@ jobs: run: | export CC=clang CXX=clang++ python3 -mpip install wheel - BUILD_VERSION=0.2.1 python3 setup.py bdist_wheel + BUILD_VERSION=0.3.0 python3 setup.py bdist_wheel - name: Upload wheel for the test-wheel job uses: actions/upload-artifact@v2 with: @@ -104,7 +104,7 @@ jobs: shell: bash run: | python3 -mpip install wheel - BUILD_VERSION=0.2.1 python3 setup.py bdist_wheel + BUILD_VERSION=0.3.0 python3 setup.py bdist_wheel - name: Upload wheel for the test-wheel job uses: actions/upload-artifact@v2 with: diff --git a/setup.py b/setup.py index 71654270889..fccf412aea7 100644 --- a/setup.py +++ b/setup.py @@ -169,7 +169,7 @@ def _main(argv): if is_nightly: tensordict_dep = "tensordict-nightly" else: - tensordict_dep = "tensordict>=0.2.0" + tensordict_dep = "tensordict>=0.3.0" if is_nightly: version = get_nightly_version() diff --git a/version.txt b/version.txt index 0c62199f16a..0d91a54c7d4 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.2.1 +0.3.0 From 830b46418c222acdd4e171606d51e9ca555d2498 Mon Sep 17 00:00:00 2001 From: vmoens Date: Mon, 8 Jan 2024 16:43:17 +0000 Subject: [PATCH 2/2] amend --- .github/scripts/m1_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/m1_script.sh b/.github/scripts/m1_script.sh index ac0f1bd68d6..8e929443ef6 100644 --- a/.github/scripts/m1_script.sh +++ b/.github/scripts/m1_script.sh @@ -2,4 +2,4 @@ export BUILD_VERSION=0.3.0 -python3 -mpip install git+https://github.com/pytorch/tensordict.git +${CONDA_RUN} pip install git+https://github.com/pytorch/tensordict.git -U