Added Ubuntu24 build

.github/workflows/snap.yaml

@@ -0,0 +1,27 @@
+name: Snap
+
+on:
+  push:
+    branches: [ubuntu24]
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  build-amd64:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: jlumbroso/free-disk-space@3e0187054f9c4bc1f55a743792872df36b2d88e0
+      with:
+        tool-cache: true
+    - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
+        fetch-tags: true
+        submodules: "recursive"
+    - uses: snapcore/action-build@v1
+    - uses: actions/upload-artifact@v4
+      with:
+        name: snap
+        path: ${{ github.workspace }}/*.snap
+        retention-days: 5

.gitmodules

@@ -1,76 +1,76 @@
 [submodule "arras/distributed/minicoord"]
 	path = arras/distributed/minicoord
-	url = ../minicoord
+	url = https://github.com/dreamworksanimation/minicoord
 	branch = main
 [submodule "arras/arras4_core"]
 	path = arras/arras4_core
-	url = ../arras4_core
+	url = https://github.com/dreamworksanimation/arras4_core
 	branch = main
 [submodule "moonray/scene_rdl2"]
 	path = moonray/scene_rdl2
-	url = ../scene_rdl2
+	url = https://github.com/dreamworksanimation/scene_rdl2
 	branch = main
 [submodule "moonray/mcrt_denoise"]
 	path = moonray/mcrt_denoise
-	url = ../mcrt_denoise
+	url = https://github.com/dreamworksanimation/mcrt_denoise
 	branch = main
 [submodule "moonray/moonray"]
 	path = moonray/moonray
-	url = ../moonray
+	url = https://github.com/dreamworksanimation/moonray
 	branch = main
 [submodule "moonray/moonshine"]
 	path = moonray/moonshine
-	url = ../moonshine
+	url = https://github.com/dreamworksanimation/moonshine
 	branch = main
 [submodule "moonray/moonshine_usd"]
 	path = moonray/moonshine_usd
-	url = ../moonshine_usd
+	url = https://github.com/dreamworksanimation/moonshine_usd
 	branch = main
 [submodule "moonray/moonray_arras/mcrt_dataio"]
 	path = moonray/moonray_arras/mcrt_dataio
-	url = ../mcrt_dataio
+	url = https://github.com/dreamworksanimation/mcrt_dataio
 	branch = main
 [submodule "moonray/moonray_arras/mcrt_computation"]
 	path = moonray/moonray_arras/mcrt_computation
-	url = ../mcrt_computation
+	url = https://github.com/dreamworksanimation/mcrt_computation
 	branch = main
 [submodule "moonray/moonray_arras/mcrt_messages"]
 	path = moonray/moonray_arras/mcrt_messages
-	url = ../mcrt_messages
+	url = https://github.com/dreamworksanimation/mcrt_messages
 	branch = main
 [submodule "moonray/moonray_gui"]
 	path = moonray/moonray_gui
-	url = ../moonray_gui
+	url = https://github.com/dreamworksanimation/moonray_gui
 	branch = main
 [submodule "moonray/hydra/hdMoonray"]
 	path = moonray/hydra/hdMoonray
-	url = ../hdMoonray
+	url = https://github.com/dreamworksanimation/hdMoonray
 	branch = main
 [submodule "arras/arras_render"]
 	path = arras/arras_render
-	url = ../arras_render
+	url = https://github.com/dreamworksanimation/arras_render
 	branch = main
 [submodule "arras/distributed/arras4_node"]
 	path = arras/distributed/arras4_node
-	url = ../arras4_node
+	url = https://github.com/dreamworksanimation/arras4_node
 	branch = main
 [submodule "cmake_modules"]
 	path = cmake_modules
-	url = ../cmake_modules
+	url = https://github.com/dreamworksanimation/cmake_modules
 	branch = main
 [submodule "moonray/hydra/moonray_sdr_plugins"]
 	path = moonray/hydra/moonray_sdr_plugins
-	url = ../moonray_sdr_plugins
+	url = https://github.com/dreamworksanimation/moonray_sdr_plugins
 	branch = main
 [submodule "moonray/moonray_dcc_plugins"]
 	path = moonray/moonray_dcc_plugins
-	url = ../moonray_dcc_plugins
+	url = https://github.com/dreamworksanimation/moonray_dcc_plugins
 	branch = main
 [submodule "moonray/render_profile_viewer"]
 	path = moonray/render_profile_viewer
-	url = ../render_profile_viewer.git
+	url = https://github.com/dreamworksanimation/render_profile_viewer.git
 	branch = main
 [submodule "rats"]
 	path = rats
-	url = ../rats
+	url = https://github.com/dreamworksanimation/rats
 	branch = main

CMakeLinuxPresets.json

@@ -1,6 +1,47 @@
 {
     "version": 4,
     "configurePresets": [
+	{
+            "name": "ubuntu24-environment",
+            "hidden": true,
+            "environment": {
+                "DEPS_ROOT"                     : "/opt/MoonRay/installs",
+                "BUILD_DIR"                     : "${sourceParentDir}/../build",
+                "Boost_ROOT"                    : "$env{DEPS_ROOT}",
+                "Libuuid_ROOT"                  : "$env{DEPS_ROOT}",
+                "CppUnit_ROOT"                  : "$env{DEPS_ROOT}",
+                "ISPC"                          : "$env{DEPS_ROOT}/bin/ispc",
+                "JsonCpp_ROOT"                  : "$env{DEPS_ROOT}",
+                "Libcurl_ROOT"                  : "$env{DEPS_ROOT}",
+                "Log4cplus_ROOT"                : "$env{DEPS_ROOT}",
+                "LUA_DIR"                       : "$env{DEPS_ROOT}",
+                "OpenSubDiv_ROOT"               : "$env{DEPS_ROOT}",
+                "OpenVDB_ROOT"                  : "$env{DEPS_ROOT}",
+                "OPTIX_ROOT"                    : "$env{DEPS_ROOT}/optix",
+                "PXR_USD_LOCATION"              : "$env{DEPS_ROOT}",
+                "PXR_INCLUDE_DIRS"              : "$env{DEPS_ROOT}/include",
+                "Random123_ROOT"                : "$env{DEPS_ROOT}",
+                "ZLIB_ROOT"                     : "$env{DEPS_ROOT}",
+                "OIIO_PYTHON"                   : "$env{DEPS_ROOT}/lib/python3.12/dist-packages"
+            },
+            "cacheVariables": {
+                "CMAKE_PREFIX_PATH": "$env{DEPS_ROOT}",
+                "PYTHON_EXECUTABLE": "python3",
+                "BOOST_PYTHON_COMPONENT_NAME": "python312",
+                "ABI_VERSION": "0"
+            }
+        },
+	{
+            "name": "ubuntu24-release",
+            "displayName": "Ubuntu24 Release",
+            "inherits": "ubuntu24-environment",
+            "binaryDir": "$env{BUILD_DIR}",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_INSTALL_PREFIX": "${sourceParentDir}/../installs/openmoonray"
+            },
+            "generator": "Unix Makefiles"
+        },
         {
             "name": "rocky9-environment",
             "hidden": true,
@@ -72,6 +113,13 @@
         }
     ],
     "buildPresets": [
+        {
+            "name": "ubuntu24-release",
+            "displayName": "Ubuntu24 Release",
+            "configurePreset": "ubuntu24-release",
+            "configuration": "Release",
+            "targets": ["install"]
+        },
         {
             "name": "rocky9-release",
             "displayName": "Rocky9 Release",

building/Ubuntu24/CMakeLists.txt

@@ -0,0 +1,208 @@
+# Copyright 2023-2024 DreamWorks Animation LLC
+# SPDX-License-Identifier: Apache-2.0
+
+# These ExternalProject targets can be used to download, build and
+# install many of the Moonray dependencies.
+# The targets are chained using dependencies so that they run
+# serially.
+
+cmake_minimum_required (VERSION 3.23.1)
+project(openmoonray_third_party)
+
+include(ExternalProject)
+
+set(InstallRoot /opt/MoonRay/installs CACHE FILEPATH "Install root for dependencies")
+
+ExternalProject_Add(JsonCpp
+    GIT_REPOSITORY https://github.com/open-source-parsers/jsoncpp.git
+    GIT_TAG 5defb4ed1a4293b8e2bf641e16b156fb9de498cc # 1.9.5
+    INSTALL_DIR ${InstallRoot}
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DBUILD_SHARED_LIBS=1
+        -DPYTHON_EXECUTABLE=/usr/bin/python3
+        -DJSONCPP_LIB_BUILD_SHARED:BOOL=ON
+        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF
+)
+set(CHAIN JsonCpp)
+
+ExternalProject_Add(OpenSubdiv
+    GIT_REPOSITORY https://github.com/PixarAnimationStudios/OpenSubdiv
+    GIT_TAG 8ffa2b6566be10209529d7a0d1db02a0796b160c # v3_5_0
+    INSTALL_DIR ${InstallRoot}
+    CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+      -DCMAKE_BUILD_TYPE=Release
+      -DPYTHON_EXECUTABLE=/usr/bin/python3
+      -DNO_PTEX=1 -DNO_OMP=1 -DNO_TBB=1 -DNO_CUDA=1 -DNO_GLFW_X11=1 -DNO_DOC=1
+      -DNO_OPENCL=1 -DNO_CLEW=1 -DNO_REGRESSION=1 -DNO_EXAMPLES=1 -DNO_TUTORIALS=1 -DNO_GLTESTS=1
+      -DNO_MACOS_FRAMEWORK=1 -DNO_METAL=1 -DNO_TESTS=1
+    DEPENDS ${CHAIN}
+)
+set(CHAIN OpenSubdiv)
+
+ExternalProject_Add(OpenEXR
+    GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openexr
+    GIT_TAG 68d9e1e17620cef00e59b43fa42c97fbcf90e72b # v3.1.8
+    INSTALL_DIR ${InstallRoot}
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DBUILD_SHARED_LIBS=OFF
+    DEPENDS ${CHAIN}
+)
+set(CHAIN OpenEXR)
+
+ExternalProject_Add(Random123
+    GIT_REPOSITORY https://github.com/DEShawResearch/random123
+    GIT_TAG 726a093cd9a73f3ec3c8d7a70ff10ed8efec8d13 # v1.14.0 (internally we use 1.08.3)
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND make install-include prefix=${InstallRoot}
+    DEPENDS ${CHAIN}
+)
+set(CHAIN Random123)
+
+ExternalProject_Add(ISPC
+    URL https://github.com/ispc/ispc/releases/download/v1.21.0/ispc-v1.21.0-linux.tar.gz
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND cp bin/ispc ${InstallRoot}/bin
+    DEPENDS ${CHAIN}
+)
+set(CHAIN ISPC)
+
+ExternalProject_Add(embree
+    GIT_REPOSITORY https://github.com/embree/embree
+    GIT_TAG 341ef8c45d1ae072ead1ab65cd76e88b03d9302c # v4.2.0
+    INSTALL_DIR ${InstallRoot}
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DEMBREE_ISPC_EXECUTABLE=<INSTALL_DIR>/bin/ispc
+        -DEMBREE_ISPC_SUPPORT=ON
+        -DEMBREE_IGNORE_INVALID_RAYS=ON
+        -DEMBREE_RAY_MASK=ON
+        -DEMBREE_MAX_ISA=AVX512
+        -DEMBREE_TUTORIALS=OFF
+        -DBUILD_SHARED_LIBS=ON
+    DEPENDS ${CHAIN}
+)
+set(CHAIN embree)
+
+ExternalProject_Add(OpenColorIO
+    GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/OpenColorIO
+    GIT_TAG d1ef24cbf8021f642e42f45f50c2cd4cc77141ce # v2.2.1
+    INSTALL_DIR ${InstallRoot}
+    CMAKE_ARGS
+        -DOCIO_BUILD_APPS=OFF
+        -DOCIO_BUILD_TESTS=OFF
+        -DOCIO_BUILD_GPU_TESTS=OFF
+        -DOCIO_USE_SSE=OFF
+        -DOCIO_BUILD_PYTHON=OFF
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DBUILD_SHARED_LIBS=ON
+        -DOCIO_BUILD_STATIC=OFF
+        -DCMAKE_CXX_STANDARD=17
+    DEPENDS ${CHAIN}
+)
+set(CHAIN OpenColorIO)
+
+ExternalProject_Add(OpenImageIO
+    GIT_REPOSITORY https://github.com/OpenImageIO/oiio
+    GIT_TAG f32bf6e6f8de38ab6d197a72fd72366b66fd30a3 # 2.5.19
+    INSTALL_DIR ${InstallRoot}
+    CMAKE_ARGS
+        -DOpenEXR_ROOT=<INSTALL_DIR>
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DUSE_QT=0
+        -DUSE_PYTHON=1
+        -DCMAKE_CXX_STANDARD=17 # or the dicom build fails with C++17 issues
+    DEPENDS ${CHAIN}
+)
+set(CHAIN OpenImageIO)
+
+ExternalProject_Add(TBB
+    URL https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2020.3.3.tar.gz
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND make ${JOBS_ARG} arch=amd64
+    INSTALL_COMMAND bash -c "cp build/*_release/libtbb*.* ${InstallRoot}/lib"
+            COMMAND bash -c "cp -r include/tbb ${InstallRoot}/include"
+    DEPENDS ${CHAIN}
+)
+set(CHAIN TBB)
+
+ExternalProject_Add(OpenImageDenoise
+    URL https://github.com/OpenImageDenoise/oidn/releases/download/v2.3.3/oidn-2.3.3.src.tar.gz
+    INSTALL_DIR ${InstallRoot}
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+        -DISPC_EXECUTABLE=<INSTALL_DIR>/bin/ispc
+        -DTBB_ROOT=<INSTALL_DIR>
+        -DOIDN_APPS=OFF
+    DEPENDS ${CHAIN}
+)
+set(CHAIN OpenImageDenoise)
+
+if(NOT NO_USD)
+    ExternalProject_Add(USD
+        GIT_REPOSITORY https://github.com/PixarAnimationStudios/USD
+        GIT_TAG 10b62439e9242a55101cf8b200f2c7e02420e1b0 # v23.08
+        INSTALL_DIR ${InstallRoot}
+        CMAKE_ARGS
+            -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+            -DCMAKE_PREFIX_PATH=<INSTALL_DIR>
+            -DPXR_ENABLE_PYTHON_SUPPORT=ON
+            -DPXR_USE_PYTHON_3=ON
+            -DPYTHON_LIBRARIES=/usr/python3/dist-packages
+            -DPYTHON_INCLUDE_DIRS=/usr/include
+            -DBoost_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu
+            -DBoost_INCLUDE_DIR=/usr/include
+            -DTBB_USE_DEBUG_BUILD=OFF
+            -DTBB_ROOT_DIR=/usr
+            -DTBB_LIBRARIES=/usr/lib/x86_64-linux-gnu
+            -DTBB_INCLUDE_DIRS=${InstallRoot}/include ..
+            -DPXR_BUILD_TESTS=OFF
+            -DPXR_BUILD_EXAMPLES=OFF
+            -DPXR_BUILD_TUTORIALS=OFF
+            -DPXR_BUILD_USD_TOOLS=OFF
+            -DPXR_ENABLE_PTEX_SUPPORT=OFF
+            -DPXR_ENABLE_OPENVDB_SUPPORT=OFF
+            -DPXR_BUILD_USDVIEW=OFF
+            -DBoost_NO_BOOST_CMAKE=ON
+            -DBoost_NO_SYSTEM_PATHS=ON
+            -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1
+        DEPENDS ${CHAIN}
+    )
+    set(CHAIN USD)
+endif()
+
+ExternalProject_Add(GLFW
+    GIT_REPOSITORY https://github.com/glfw/glfw
+    GIT_TAG 3.4
+    BUILD_COMMAND make ${JOBS_ARG}
+    CMAKE_ARGS
+        -DCMAKE_PREFIX_PATH:PATH=${InstallRoot}
+        -DCMAKE_INSTALL_PREFIX:PATH=${InstallRoot}
+        -DGLFW_BUILD_EXAMPLES=OFF
+        -DGLFW_BUILD_TESTS=OFF
+        -DGLFW_BUILD_DOCS=OFF
+        -DGLFW_INSTALL=ON
+        -DBUILD_SHARED_LIBS=ON
+    DEPENDS ${CHAIN}
+)
+set(CHAIN GLFW)
+
+ExternalProject_Add(OptiXHeaders
+    GIT_REPOSITORY https://github.com/NVIDIA/optix-dev
+    GIT_TAG v7.6.0
+    INSTALL_DIR ${InstallRoot}
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
+        <SOURCE_DIR>/include
+        <INSTALL_DIR>/include
+    DEPENDS ${CHAIN}
+)
+set(CHAIN OptiXHeaders)