wip

Signed-off-by: Larry Gritz <lg@larrygritz.com>
AcademySoftwareFoundation · Jan 4, 2024 · e132c80 · e132c80
1 parent 08c7cc5
commit e132c80
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/gpu.yml b/.github/workflows/gpu.yml
@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - desc: latest releases gcc11/C++17 llvm15 boost1.71 exr3.2 py3.9 avx2 batch-b16avx512
+          - desc: latest releases gcc11/C++17 llvm15 boost1.74 exr3.2 py3.10 avx2
             nametag: linux-latest-releases
             runner: ubuntu-20.04-gpu-t4-4c-16g-176h
             cxx_compiler: g++-11
@@ -50,12 +50,15 @@ jobs:
             pybind11_ver: v2.10.0
             python_ver: "3.10"
             simd: avx2,f16c
-            # batched: b8_AVX2,b8_AVX512,b16_AVX512
             setenvs: export LLVM_VERSION=15.0.6
                             LLVM_DISTRO_NAME=ubuntu-18.04
                             OPENCOLORIO_VERSION=v2.2.0
                             PUGIXML_VERSION=v1.13
-                            USE_GPU=1
+                            OSL_USE_OPTIX=1
+                            OPTIX_VERSION=7.0
+                            OSL_UBUNTU_INSTALL_PACKAGES="cuda-toolkit"
+                            UBUNTU_INSTALL_OPENEXR=0
+                            UBUNTU_INSTALL_OCIO=0
 
     runs-on: ${{matrix.runner}}
     env:

diff --git a/src/build-scripts/ci-build.bash b/src/build-scripts/ci-build.bash
@@ -12,6 +12,10 @@ if [[ "$USE_SIMD" != "" ]] ; then
     OSL_CMAKE_FLAGS="$OSL_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"
 fi
 
+if [[ "$OSL_USE_OPTIX" != "" ]] ; then
+    OSL_CMAKE_FLAGS="$OSL_CMAKE_FLAGS -DOSL_USE_OPTIX=$OSL_USE_OPTIX"
+fi
+
 if [[ -n "$CODECOV" ]] ; then
     OSL_CMAKE_FLAGS="$OSL_CMAKE_FLAGS -DCODECOV=${CODECOV}"
 fi

diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash
@@ -68,12 +68,16 @@ else
     time sudo apt-get -q install -y \
         git cmake ninja-build ccache g++ \
         libboost-dev libboost-thread-dev libboost-filesystem-dev \
-        libilmbase-dev libopenexr-dev \
         libtiff-dev libgif-dev libpng-dev \
         flex bison libbison-dev \
         libpugixml-dev \
-        libopencolorio-dev
-
+        ${OSL_UBUNTU_INSTALL_PACKAGES}
+    if [[ "${UBUNTU_INSTALL_OPENEXR}" != "0" ]] ; then
+        time sudo apt-get -q install -y libilmbase-dev libopenexr-dev
+    fi
+    if [[ "${UBUNTU_INSTALL_OCIO}" != "0" ]] ; then
+        time sudo apt-get -q install -y libopencolorio-dev
+    fi
     if [[ "${QT_VERSION:-5}" == "5" ]] ; then
         time sudo apt-get -q install -y \
             qt5-default || /bin/true

diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
@@ -258,6 +258,7 @@ if (OSL_USE_OPTIX)
         target_link_libraries (${TARGET} PRIVATE ${CUDA_LIBRARIES} ${CUDA_EXTRA_LIBS} ${OPTIX_LIBRARIES} ${OPTIX_EXTRA_LIBS})
     endfunction()
 else ()
+    message(STATUS "CUDA/OptiX support disabled")
     function (osl_optix_target TARGET)
     endfunction()
 endif ()