Skip to content

Commit

Permalink
Merge branch 'lwawrzyniak/release-1.2/fix-remaining-numpy2-issues' in…
Browse files Browse the repository at this point in the history
…to 'release-1.2'

Fix remaining Numpy 2.0 issues

See merge request omniverse/warp!607
  • Loading branch information
nvlukasz committed Jul 4, 2024
2 parents 1b4013a + f00666f commit b62f1b8
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# distribution of this software and related documentation without an express
# license agreement from NVIDIA CORPORATION is strictly prohibited.

name: Build and Test Warp
name: CI

on:
workflow_call:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ concurrency:

jobs:
build-and-test:
uses: ./.github/workflows/build-and-test.yml
uses: ./.github/workflows/ci.yml
secrets: inherit
5 changes: 2 additions & 3 deletions .gitlab/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,21 @@
/warp/builtins.py
/warp/constants.py
/licenses/
/warp/examples/
/README.md
/SECURITY.md

^[CI/CD] @ershi @ncapens
/.github/
/.gitlab/
/warp/tests/
/warp/thirdparty/unittest_parallel.py
/.gitlab-ci.yml
/.pre-commit-config.yaml
.gitignore
.gitattributes

^[Sphinx Documentation] @mmacklin @ershi
^[Docs and Examples] @mmacklin @ershi
/docs/
/warp/examples/

^[Code Generation] @ncapens @mmacklin
/warp/codegen.py
Expand Down
3 changes: 3 additions & 0 deletions .gitlab/ci/additional-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ windows-x86_64 test:
- .\_venv\Scripts\Activate.ps1
- python -m pip install --upgrade pip
- python -m pip install --upgrade usd-core
# Temporary HACK: use NumPy < 2.0 on Windows due to issues with Torch wheels that are not compatible
# https://github.com/pytorch/pytorch/issues/128860
- python -m pip install "numpy<2"
- python -m pip install --upgrade torch --extra-index-url https://download.pytorch.org/whl/cu121
- python -m pip install -e .
- Write-Output "$([char]27)[0Ksection_end:$(GetTime):install_dependencies$([char]13)$([char]27)[0K"
Expand Down
3 changes: 3 additions & 0 deletions .gitlab/ci/cuda-11-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ windows-x86_64 test:
- .\_venv\Scripts\Activate.ps1
- python -m pip install --upgrade pip
- python -m pip install --upgrade usd-core
# Temporary HACK: use NumPy < 2.0 on Windows due to issues with Torch wheels that are not compatible
# https://github.com/pytorch/pytorch/issues/128860
- python -m pip install "numpy<2"
- python -m pip install --upgrade torch --extra-index-url https://download.pytorch.org/whl/cu121
- python -m pip install -e .
- Write-Output "$([char]27)[0Ksection_end:$(GetTime):install_dependencies$([char]13)$([char]27)[0K"
Expand Down
3 changes: 3 additions & 0 deletions .gitlab/ci/debug-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ windows-x86_64 test:
- .\_venv\Scripts\Activate.ps1
- python -m pip install --upgrade pip
- python -m pip install --upgrade usd-core
# Temporary HACK: use NumPy < 2.0 on Windows due to issues with Torch wheels that are not compatible
# https://github.com/pytorch/pytorch/issues/128860
- python -m pip install "numpy<2"
- python -m pip install --upgrade torch --extra-index-url https://download.pytorch.org/whl/cu121
- python -m pip install -e .
- Write-Output "$([char]27)[0Ksection_end:$(GetTime):install_dependencies$([char]13)$([char]27)[0K"
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG

## [1.2.2] - 2024-06-19
## [1.2.2] - 2024-07-04

- Support for NumPy >= 2.0

Expand Down
2 changes: 1 addition & 1 deletion exts/omni.warp.core/docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG

## [1.2.2] - 2024-06-19
## [1.2.2] - 2024-07-04

- Support for NumPy >= 2.0

Expand Down
2 changes: 1 addition & 1 deletion exts/omni.warp/docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG

## [1.2.2] - 2024-06-19
## [1.2.2] - 2024-07-04

- Support for NumPy >= 2.0

Expand Down

0 comments on commit b62f1b8

Please sign in to comment.