diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d71939b..beecf5f 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -37,7 +37,7 @@ jobs: submodules: true - name: Download Bazelisk - run: curl -k -L https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-windows-amd64.exe -o $env:BAZEL_PATH + run: curl -k -L https://github.com/bazelbuild/bazelisk/releases/download/v1.17.0/bazelisk-windows-amd64.exe -o $env:BAZEL_PATH - uses: actions/cache@v2 with: @@ -46,15 +46,31 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - #============# + #=============# + # Python 3.11 # + #=============# + - name: py311 + uses: actions/setup-python@v2 + with: + python-version: "3.11" + - name: py311 pip install + run: pip install -r "$env:GITHUB_WORKSPACE/build-requirements.txt" + - name: py311 build whl and upload + run: | + cd "$env:GITHUB_WORKSPACE/jax" + ../bazel-build-cpu.ps1 -bazel_path $env:BAZEL_PATH + az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' + rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" + + #=============# # Python 3.10 # - #============# + #=============# - name: py310 uses: actions/setup-python@v2 with: python-version: "3.10" - name: py310 pip install - run: pip install -r "$env:GITHUB_WORKSPACE/build-requirements-py310.txt" + run: pip install -r "$env:GITHUB_WORKSPACE/build-requirements.txt" - name: py310 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" @@ -94,23 +110,8 @@ jobs: az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" - #============# - # Python 3.7 # - #============# - - name: py37 - uses: actions/setup-python@v2 - with: - python-version: "3.7" - - name: py37 pip install - run: pip install -r "$env:GITHUB_WORKSPACE/build-requirements.txt" - - name: py37 build whl and upload - run: | - cd "$env:GITHUB_WORKSPACE/jax" - ../bazel-build-cpu.ps1 -bazel_path $env:BAZEL_PATH - az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' - rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" - build-cuda111: + if: ${{ false }} # disable for now runs-on: windows-2019 env: AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }} @@ -143,7 +144,7 @@ jobs: submodules: true - name: Download Bazelisk - run: curl -k -L https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-windows-amd64.exe -o $env:BAZEL_PATH + run: curl -k -L https://github.com/bazelbuild/bazelisk/releases/download/v1.17.0/bazelisk-windows-amd64.exe -o $env:BAZEL_PATH - name: Install CUDA 11.1 run: | @@ -159,6 +160,22 @@ jobs: restore-keys: | ${{ runner.os }}-pip- + #=============# + # Python 3.11 # + #=============# + - name: py311 + uses: actions/setup-python@v2 + with: + python-version: "3.11" + - name: py311 pip install + run: pip install -r "$env:GITHUB_WORKSPACE/build-requirements.txt" + - name: py311 build whl and upload + run: | + cd "$env:GITHUB_WORKSPACE/jax" + ../bazel-build-cuda.ps1 -bazel_path $env:BAZEL_PATH -cuda_version '11.1' -cuda_prefix 'D:/CUDA' + az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' + rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" + #=============# # Python 3.10 # #=============# @@ -167,7 +184,7 @@ jobs: with: python-version: "3.10" - name: py310 pip install - run: pip install -r "$env:GITHUB_WORKSPACE/build-requirements-py310.txt" + run: pip install -r "$env:GITHUB_WORKSPACE/build-requirements.txt" - name: py310 build whl and upload run: | cd "$env:GITHUB_WORKSPACE/jax" @@ -207,34 +224,20 @@ jobs: az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" - #============# - # Python 3.7 # - #============# - - name: py37 - uses: actions/setup-python@v2 - with: - python-version: "3.7" - - name: py37 pip install - run: pip install -r "$env:GITHUB_WORKSPACE/build-requirements.txt" - - name: py37 build whl and upload - run: | - cd "$env:GITHUB_WORKSPACE/jax" - ../bazel-build-cuda.ps1 -bazel_path $env:BAZEL_PATH -cuda_version '11.1' -cuda_prefix 'D:/CUDA' - az storage blob upload-batch --overwrite -d unstable -s "$env:GITHUB_WORKSPACE/jax/bazel-dist" --pattern '*.whl' - rm -Recurse -Force "$env:GITHUB_WORKSPACE/jax/bazel-dist" - update-index: if: ${{ ! cancelled() }} - needs: [build-cpu, build-cuda111] + needs: + - build-cpu + # - build-cuda111 runs-on: windows-2019 env: AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }} steps: - uses: actions/checkout@v2 - - name: py39 + - name: py311 uses: actions/setup-python@v2 with: - python-version: "3.9" + python-version: "3.11" - name: update index.html run: | cd "$env:GITHUB_WORKSPACE/" diff --git a/build-requirements-py310.txt b/build-requirements-py310.txt deleted file mode 100644 index 5e76193..0000000 --- a/build-requirements-py310.txt +++ /dev/null @@ -1,8 +0,0 @@ -# https://github.com/pypa/setuptools/pull/3690 -setuptools>=65.6.1 - -numpy==1.21.5 -scipy==1.7.3 -wheel -six -auditwheel diff --git a/build-requirements.txt b/build-requirements.txt index 722663f..e5b3f62 100644 --- a/build-requirements.txt +++ b/build-requirements.txt @@ -1,8 +1,8 @@ # https://github.com/pypa/setuptools/pull/3690 setuptools>=65.6.1 -numpy==1.20.3 -scipy==1.5.4 +numpy==1.23.5 +scipy==1.9.3 wheel six auditwheel diff --git a/jax b/jax index a683186..1b91801 160000 --- a/jax +++ b/jax @@ -1 +1 @@ -Subproject commit a683186570404a05a2aea9f7e452400bb0299e57 +Subproject commit 1b9180167b1799848166635246f1f33a5fb21c1b diff --git a/windows_configure.bazelrc b/windows_configure.bazelrc index f9c607d..18cddbd 100644 --- a/windows_configure.bazelrc +++ b/windows_configure.bazelrc @@ -7,3 +7,5 @@ build:windows --host_copt=/d2ReducedOptimizeHugeFunctions build:windows --copt=/arch:AVX build:windows --copt=/arch:AVX2 +build:windows --copt=/DTF_COMPILE_LIBRARY +