From 71a5f4df8ebe89f846da4479e59c016781a15140 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 11 May 2023 14:40:10 -0700 Subject: [PATCH 1/5] Explicitly link against blas in lib. --- rust/src/lib.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rust/src/lib.rs b/rust/src/lib.rs index 58c242c0..26c3abef 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -5,6 +5,9 @@ #![warn(missing_docs)] #![warn(missing_doc_code_examples)] +#[cfg(feature = "blas")] +extern crate blas_src; + pub mod constants; pub mod data_loader; pub mod geometry; From 840a78c7f816188da6ad08e5714687da7400e3b3 Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Thu, 11 May 2023 18:42:34 -0400 Subject: [PATCH 2/5] Use conda-forge pytorch. --- conda/environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda/environment.yml b/conda/environment.yml index f6eecada..eaebf1f6 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -1,6 +1,5 @@ name: av2 channels: - - pytorch - conda-forge/label/rust_dev - conda-forge dependencies: From 2de7f5a047f76b8db104e6c2e4df317c67d20f1f Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Sat, 13 May 2023 23:13:57 -0700 Subject: [PATCH 3/5] Add windows builds. --- .github/workflows/ci.yaml | 2 +- .github/workflows/release.yaml | 46 +++++++++++++++++----------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 37cda778..812b99ae 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, ubuntu-latest] + os: [macos-latest, ubuntu-latest, windows-latest] python_version: ["3.8", "3.9", "3.10"] defaults: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5a56acef..35399241 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -38,29 +38,29 @@ jobs: name: wheels path: dist - # windows: - # runs-on: windows-latest - # strategy: - # matrix: - # target: [x64, x86] - # steps: - # - uses: actions/checkout@v3 - # - uses: actions/setup-python@v4 - # with: - # python-version: "3.10" - # architecture: ${{ matrix.target }} - # - name: Build wheels - # uses: PyO3/maturin-action@v1 - # with: - # target: ${{ matrix.target }} - # args: --release --out dist --find-interpreter - # sccache: "true" - # rust-toolchain: nightly - # - name: Upload wheels - # uses: actions/upload-artifact@v3 - # with: - # name: wheels - # path: dist + windows: + runs-on: windows-latest + strategy: + matrix: + target: [x64, x86] + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: "3.10" + architecture: ${{ matrix.target }} + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + args: --release --out dist --find-interpreter + sccache: "true" + rust-toolchain: nightly + - name: Upload wheels + uses: actions/upload-artifact@v3 + with: + name: wheels + path: dist macos: runs-on: macos-latest From 133bc22c2fd4e557327ec35ea9ba8870ef25038f Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Sat, 13 May 2023 23:53:28 -0700 Subject: [PATCH 4/5] Update env. --- conda/environment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conda/environment.yml b/conda/environment.yml index eaebf1f6..b01fa1cc 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -1,6 +1,5 @@ name: av2 channels: - - conda-forge/label/rust_dev - conda-forge dependencies: - av @@ -21,7 +20,7 @@ dependencies: - pyarrow - pyproj - rich - - rust + - conda-forge/label/rust_dev::rust - scipy - pytorch - tqdm From 8418d39de30ae75c6fdf6de8753352decbda147a Mon Sep 17 00:00:00 2001 From: Benjamin Wilson Date: Sat, 13 May 2023 23:53:50 -0700 Subject: [PATCH 5/5] Update env. --- conda/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/environment.yml b/conda/environment.yml index b01fa1cc..4f995ab7 100644 --- a/conda/environment.yml +++ b/conda/environment.yml @@ -2,6 +2,7 @@ name: av2 channels: - conda-forge dependencies: + - conda-forge/label/rust_dev::rust - av - click - joblib @@ -20,7 +21,6 @@ dependencies: - pyarrow - pyproj - rich - - conda-forge/label/rust_dev::rust - scipy - pytorch - tqdm