Skip to content

Commit

Permalink
Merge branch 'ershi/release-1.4.1' into 'release-1.4'
Browse files Browse the repository at this point in the history
Bug fixes for Version 1.4.1

See merge request omniverse/warp!801
  • Loading branch information
shi-eric committed Oct 14, 2024
2 parents b39f2ae + b1309f1 commit 13e778c
Show file tree
Hide file tree
Showing 36 changed files with 723 additions and 296 deletions.
8 changes: 2 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ linux-aarch64 build:
- apt-get update && apt-get install build-essential curl --no-install-recommends -y
- echo -e "\\e[0Ksection_end:`date +%s`:install_dependencies\\r\\e[0K"
script:
- ./tools/ci/building/build-linux-x86_64/build.sh --no-docker # We are already using the builder image
- ./tools/ci/building/build-linux-aarch64/build.sh --no-docker # We are already using the builder image
- mkdir -p warp/bin/linux-aarch64
- mv warp/bin/warp.so warp/bin/linux-aarch64
- mv warp/bin/warp-clang.so warp/bin/linux-aarch64
Expand Down Expand Up @@ -338,11 +338,7 @@ windows-x86_64 test mgpu:
- tools/packman/packman.cmd install -l _build/target-deps/python python $python_name
- '& $env:CI_PROJECT_DIR\_build\target-deps\python\python.exe -m venv _venv'
- .\_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 pip usd-core numpy
- 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
6 changes: 1 addition & 5 deletions .gitlab/ci/additional-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ windows-x86_64 test:
- tools/packman/packman.cmd install -l _build/target-deps/python python $python_name
- '& $env:CI_PROJECT_DIR\_build\target-deps\python\python.exe -m venv _venv'
- .\_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 pip usd-core numpy
- 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
8 changes: 2 additions & 6 deletions .gitlab/ci/cuda-11-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ linux-aarch64 build:
- apt-get update && apt-get install build-essential curl --no-install-recommends -y
- echo -e "\\e[0Ksection_end:`date +%s`:install_dependencies\\r\\e[0K"
script:
- ./tools/ci/building/build-linux-x86_64/build.sh --cuda 11 --no-docker # We are already using the builder image
- ./tools/ci/building/build-linux-aarch64/build.sh --cuda 11 --no-docker # We are already using the builder image
- mkdir -p warp/bin/linux-aarch64
- mv warp/bin/warp.so warp/bin/linux-aarch64
- mv warp/bin/warp-clang.so warp/bin/linux-aarch64
Expand Down Expand Up @@ -145,11 +145,7 @@ windows-x86_64 test:
- tools/packman/packman.cmd install -l _build/target-deps/python python $python_name
- '& $env:CI_PROJECT_DIR\_build\target-deps\python\python.exe -m venv _venv'
- .\_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 pip usd-core numpy
- 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
6 changes: 1 addition & 5 deletions .gitlab/ci/debug-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,7 @@ windows-x86_64 test:
- tools/packman/packman.cmd install -l _build/target-deps/python python $python_name
- '& $env:CI_PROJECT_DIR\_build\target-deps\python\python.exe -m venv _venv'
- .\_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 pip usd-core numpy
- 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
Loading

0 comments on commit 13e778c

Please sign in to comment.