Skip to content

Commit a14c09a

Browse files
authored
CI fixes
* Fix the blaze_INCLUDE_DIR setting for macosci * Use absolute home path for blaze on osx CI/CD pipeline * Avoid using FAIL in non-test function * Update CUDA toolkit version to 12.8 in CI configuration and packaging scripts * Use NVIDIA's official docker container instead of our self-built one * Use Intel oneAPI+CUDA container * Load intel oneapi * Use ${CASCADE_INSTALL_DIR}/build instead of ${CASCADE_INSTALL_DIR}/atm to make it consistent in our upgraded docker * Build opencascade * Eliminate the noisy information in the CI/CD output * Fix the target dir of opencascade * Remove OCCT_INSTALL_BIN_LETTER from opencascade * Use external installation location * Use CMAKE_INSTALL_PREFIX to specify prefix * Fix the syntax error in the buildOCCT script * Use pre-built opencascade * Manually include chrono to make it compatible with microsoft/STL#5105 * Build VSG before running test on Windows * Remove additional character in Windows's testing pipeline * Change the vsg library path to Windows's style
1 parent 617af52 commit a14c09a

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"glm_DIR": "$env{HOME}/Packages/gl/$env{LIB_DIR}/cmake/glm",
8585
"OpenCRG_INCLUDE_DIR": "$env{HOME}/Packages/OpenCRG/include",
8686
"OpenCRG_LIBRARY": "$env{HOME}/Packages/OpenCRG/lib/libOpenCRG.1.1.2.a",
87-
"OpenCASCADE_DIR": "$env{HOME}/Packages/opencascade-7.4.0/adm",
87+
"OpenCASCADE_DIR": "$env{HOME}/Packages/opencascade-7.4.0/$env{LIB_DIR}/cmake/opencascade",
8888
"spectra_INCLUDE_DIR": "$env{HOME}/Packages/spectra/include",
8989
"vsg_DIR": "$env{CI_PROJECT_DIR}/contrib/build-scripts/vsg_build/lib/cmake/vsg",
9090
"vsgImGui_DIR": "$env{CI_PROJECT_DIR}/contrib/build-scripts/vsg_build/lib/cmake/vsgImGui",

contrib/.gitlab-ci.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,13 @@ linux:doxygen:deploy:
6969
tags:
7070
- linux
7171
image:
72-
name: uwsbel/packages:test
72+
name: uwsbel/packages:cuda12.8.1
7373
before_script:
7474
# Defining configuration variables
7575
- export DEBIAN_FRONTEND=noninteractive
7676
- export LIB_DIR="lib"
7777
- export IOMP5_DIR=""
78-
- apt-get update; apt-get -y install unzip wget python3 python3-pip libomp-dev
79-
git cmake ninja-build doxygen libvulkan-dev pkg-config libirrlicht-dev
80-
freeglut3-dev mpich libasio-dev libboost-dev libglfw3-dev libglm-dev
81-
libglew-dev libtinyxml2-dev swig python3-dev libhdf5-dev libnvidia-gl-535
82-
curl software-properties-common
78+
- source /opt/intel/oneapi/setvars.sh
8379
- ldconfig
8480
# ROS
8581
- add-apt-repository universe
@@ -277,7 +273,7 @@ windows:vs2022:build:
277273
# Build urdf with buildURDF script
278274
- '& $CI_PROJECT_DIR\contrib\build-scripts\windows\buildURDF.bat $CI_PROJECT_DIR\contrib\build-scripts\urdf_build'
279275
# Configuring chrono
280-
- cmake -B "$CI_PROJECT_DIR\build" -S "$CI_PROJECT_DIR" -T "cuda=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.2" -DCMAKE_CXX_FLAGS="/MP4" -DPython3_FIND_STRATEGY:STRING=LOCATION -DPython3_ROOT_DIR:PATH="C:/Users/builder/miniconda3" --preset=windowsci-vs2022
276+
- cmake -B "$CI_PROJECT_DIR\build" -S "$CI_PROJECT_DIR" -T "cuda=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.8" -DCMAKE_CXX_FLAGS="/MP4" -DPython3_FIND_STRATEGY:STRING=LOCATION -DPython3_ROOT_DIR:PATH="C:/Users/builder/miniconda3" --preset=windowsci-vs2022
281277
- cd build
282278
# Building chrono
283279
- cmake --build . -j 8 --config Release
@@ -291,6 +287,9 @@ windows:vs2022:test:
291287
needs: ["windows:vs2022:build"]
292288
extends: .windows
293289
script:
290+
# Build vsg with buildVSG script
291+
- '& $CI_PROJECT_DIR\contrib\build-scripts\windows\buildVSG.bat $CI_PROJECT_DIR\contrib\build-scripts\vsg_build'
292+
- $env:PATH += ";$CI_PROJECT_DIR\contrib\build-scripts\vsg_build\bin"
294293
- cd build
295294
- ctest --output-on-failure -E "utest_PARSERS|utest_FSI"
296295
dependencies: ["windows:vs2022:build"]

contrib/build-scripts/linux/buildChrono.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ cmake -G ${BUILDSYSTEM} -B ${BUILD_DIR} -S ${SOURCE_DIR} \
8383
-DGLM_INCLUDE_DIR:PATH=${GL_INSTALL_DIR}/include \
8484
-DOpenCRG_INCLUDE_DIR:PATH=${CRG_INCLUDE_DIR} \
8585
-DOpenCRG_LIBRARY:FILEPATH=${CRG_LIBRARY} \
86-
-DOpenCASCADE_DIR:PATH=${CASCADE_INSTALL_DIR}/adm \
86+
-DOpenCASCADE_DIR:PATH=${CASCADE_INSTALL_DIR}/${LIB_DIR}/cmake/opencascade \
8787
-DSpectra_INCLUDE_DIR:PATH=${SPECTRA_INCLUDE_DIR}/include \
8888
-DMATLAB_SDK_ROOT:PATH=${MATLAB_INSTALL_DIR}/extern \
8989
-Dvsg_DIR:PATH=${VSG_INSTALL_DIR}/${LIB_DIR}/cmake/vsg \

contrib/packaging-python/conda/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cmake -G "Visual Studio 17 2022" -T "v142" ^
4444
-DCH_ENABLE_MODULE_SENSOR=ON ^
4545
-DNUMPY_INCLUDE_DIR="C:/Users/builder/miniconda3/pkgs/numpy-base/Lib/site-packages/numpy/core/include/" ^
4646
-DOptiX_INSTALL_DIR="C:/ProgramData/NVIDIA Corporation/OptiX SDK 7.7.0" ^
47-
-DCUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.2" ^
47+
-DCUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v12.8" ^
4848
-DGLFW_DLL="C:/Users/builder/Documents/glfw-3.3.5/lib-vc2019/glfw3.dll" ^
4949
-DGLFW_INCLUDE_DIR="C:/Users/builder/Documents/glfw-3.3.5/include" ^
5050
-DGLFW_LIBRARY="C:/Users/builder/Documents/glfw-3.3.5/lib-vc2019/glfw3dll.lib" ^

contrib/packaging-python/conda/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ cmake -G "Ninja" -DCMAKE_INSTALL_PREFIX=$PREFIX \
5252
-DBUILD_BENCHMARKING=OFF \
5353
-DBUILD_GMOCK=OFF \
5454
-DCH_ENABLE_MODULE_CASCADE=ON \
55-
-DOpenCASCADE_DIR=$HOME/Packages/opencascade-7.4.0/adm \
55+
-DOpenCASCADE_DIR=$HOME/Packages/opencascade-7.4.0/lib/cmake/opencascade \
5656
-DCH_ENABLE_MODULE_PARDISO_MKL=ON \
5757
-DMKL_INCLUDE_DIR=$BUILD_PREFIX/include \
5858
-DMKL_RT_LIBRARY=$BUILD_PREFIX/lib/libmkl_rt.so \

src/chrono_sensor/optix/ChOptixUtils.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <optix.h>
2323
#include <cuda_runtime_api.h>
2424
#include <nvrtc.h>
25+
#include <chrono>
2526

2627
#include "chrono/assets/ChVisualMaterial.h"
2728
#include "chrono/assets/ChVisualShapeBox.h"

0 commit comments

Comments
 (0)