Skip to content

Commit b4e31e0

Browse files
committed
Merge branch 'ershi/fix-numpy-ci' into 'main'
Fix remaining NumPy+Torch CI Issues See merge request omniverse/warp!592
2 parents 69abd82 + 3f977ed commit b4e31e0

File tree

6 files changed

+13
-5
lines changed

6 files changed

+13
-5
lines changed

.github/workflows/build-and-test.yml renamed to .github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# distribution of this software and related documentation without an express
66
# license agreement from NVIDIA CORPORATION is strictly prohibited.
77

8-
name: Build and Test Warp
8+
name: CI
99

1010
on:
1111
workflow_call:

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ concurrency:
1919

2020
jobs:
2121
build-and-test:
22-
uses: ./.github/workflows/build-and-test.yml
22+
uses: ./.github/workflows/ci.yml
2323
secrets: inherit

.gitlab/CODEOWNERS

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,21 @@
1414
/warp/builtins.py
1515
/warp/constants.py
1616
/licenses/
17-
/warp/examples/
1817
/README.md
1918
/SECURITY.md
2019

2120
^[CI/CD] @ershi @ncapens
2221
/.github/
2322
/.gitlab/
24-
/warp/tests/
2523
/warp/thirdparty/unittest_parallel.py
2624
/.gitlab-ci.yml
2725
/.pre-commit-config.yaml
2826
.gitignore
2927
.gitattributes
3028

31-
^[Sphinx Documentation] @mmacklin @ershi
29+
^[Docs and Examples] @mmacklin @ershi
3230
/docs/
31+
/warp/examples/
3332

3433
^[Code Generation] @ncapens @mmacklin
3534
/warp/codegen.py

.gitlab/ci/additional-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ windows-x86_64 test:
6767
- .\_venv\Scripts\Activate.ps1
6868
- python -m pip install --upgrade pip
6969
- python -m pip install --upgrade usd-core
70+
# Temporary HACK: use NumPy < 2.0 on Windows due to issues with Torch wheels that are not compatible
71+
# https://github.com/pytorch/pytorch/issues/128860
72+
- python -m pip install "numpy<2"
7073
- python -m pip install --upgrade torch --extra-index-url https://download.pytorch.org/whl/cu121
7174
- python -m pip install -e .
7275
- Write-Output "$([char]27)[0Ksection_end:$(GetTime):install_dependencies$([char]13)$([char]27)[0K"

.gitlab/ci/cuda-11-build-and-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ windows-x86_64 test:
147147
- .\_venv\Scripts\Activate.ps1
148148
- python -m pip install --upgrade pip
149149
- python -m pip install --upgrade usd-core
150+
# Temporary HACK: use NumPy < 2.0 on Windows due to issues with Torch wheels that are not compatible
151+
# https://github.com/pytorch/pytorch/issues/128860
152+
- python -m pip install "numpy<2"
150153
- python -m pip install --upgrade torch --extra-index-url https://download.pytorch.org/whl/cu121
151154
- python -m pip install -e .
152155
- Write-Output "$([char]27)[0Ksection_end:$(GetTime):install_dependencies$([char]13)$([char]27)[0K"

.gitlab/ci/debug-build-and-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@ windows-x86_64 test:
136136
- .\_venv\Scripts\Activate.ps1
137137
- python -m pip install --upgrade pip
138138
- python -m pip install --upgrade usd-core
139+
# Temporary HACK: use NumPy < 2.0 on Windows due to issues with Torch wheels that are not compatible
140+
# https://github.com/pytorch/pytorch/issues/128860
141+
- python -m pip install "numpy<2"
139142
- python -m pip install --upgrade torch --extra-index-url https://download.pytorch.org/whl/cu121
140143
- python -m pip install -e .
141144
- Write-Output "$([char]27)[0Ksection_end:$(GetTime):install_dependencies$([char]13)$([char]27)[0K"

0 commit comments

Comments
 (0)