diff --git a/pixi.lock b/pixi.lock index cf84d6c2..70fbd23d 100644 --- a/pixi.lock +++ b/pixi.lock @@ -41,6 +41,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/linux-64/cxx-compiler-1.7.0-h00ab1b0_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/dispenso-1.3.0-hac33072_2.conda + - conda: https://conda.anaconda.org/conda-forge/linux-64/drjit-cpp-0.4.6-hac33072_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/eigen-3.4.0-h00ab1b0_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.2.0-pyhd8ed1ab_2.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/ezc3d-1.5.9-py312_python3_h0990d18_0.conda @@ -230,6 +231,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/compiler-rt_osx-arm64-16.0.6-h3808999_2.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/cxx-compiler-1.7.0-h2ffa867_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/dispenso-1.3.0-h00cdb27_2.conda + - conda: https://conda.anaconda.org/conda-forge/osx-arm64/drjit-cpp-0.4.6-h00cdb27_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/eigen-3.4.0-h1995070_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.2.0-pyhd8ed1ab_2.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/ezc3d-1.5.9-py312_python3_h0e7aeb7_0.conda @@ -405,6 +407,7 @@ environments: - conda: https://conda.anaconda.org/nvidia/noarch/cuda-version-12.5-3.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/win-64/cxx-compiler-1.7.0-h91493d7_1.conda - conda: https://conda.anaconda.org/conda-forge/win-64/dispenso-1.3.0-he0c23c2_2.conda + - conda: https://conda.anaconda.org/conda-forge/win-64/drjit-cpp-0.4.6-he0c23c2_1.conda - conda: https://conda.anaconda.org/conda-forge/win-64/eigen-3.4.0-h91493d7_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.2.0-pyhd8ed1ab_2.conda - conda: https://conda.anaconda.org/conda-forge/win-64/ezc3d-1.5.9-py312_python3_hcb2535b_0.conda @@ -2451,6 +2454,52 @@ packages: license: MIT size: 197601 timestamp: 1719092278217 +- kind: conda + name: drjit-cpp + version: 0.4.6 + build: h00cdb27_1 + build_number: 1 + subdir: osx-arm64 + url: https://conda.anaconda.org/conda-forge/osx-arm64/drjit-cpp-0.4.6-h00cdb27_1.conda + sha256: 78598d0cdca927eebc29d7943618438a70d31be84b2c9065ee1d8c0da8dfef64 + md5: b4f615135b35d8dd606b55a51be632d4 + depends: + - __osx >=11.0 + - libcxx >=16 + license: BSD-3-Clause + size: 127286 + timestamp: 1719086929816 +- kind: conda + name: drjit-cpp + version: 0.4.6 + build: hac33072_1 + build_number: 1 + subdir: linux-64 + url: https://conda.anaconda.org/conda-forge/linux-64/drjit-cpp-0.4.6-hac33072_1.conda + sha256: a4e3366d3e43ad17eeb492e49f672346c29eb5ea8cc16f0daf2f9bf61ee648d8 + md5: 2c43182dd9b80db4816e13c5eec75196 + depends: + - libgcc-ng >=12 + - libstdcxx-ng >=12 + license: BSD-3-Clause + size: 126794 + timestamp: 1719087183574 +- kind: conda + name: drjit-cpp + version: 0.4.6 + build: he0c23c2_1 + build_number: 1 + subdir: win-64 + url: https://conda.anaconda.org/conda-forge/win-64/drjit-cpp-0.4.6-he0c23c2_1.conda + sha256: d3a5d792c084541d7fdb4d08c38526e4cb975a696a548411dd5b3d8b2849e1a5 + md5: a8997699bfacf919b16d7845cbc4cc04 + depends: + - ucrt >=10.0.20348.0 + - vc >=14.2,<15 + - vc14_runtime >=14.29.30139 + license: BSD-3-Clause + size: 127394 + timestamp: 1719087651692 - kind: conda name: eigen version: 3.4.0 diff --git a/pixi.toml b/pixi.toml index 168dc7df..bf4cd1d0 100644 --- a/pixi.toml +++ b/pixi.toml @@ -26,6 +26,7 @@ blas = ">=1.1,<3" ceres-solver = ">=2.2.0,<2.3" cli11 = ">=2.4.1,<2.5" dispenso = ">=1.3.0,<1.4" +drjit-cpp = ">=0.4.6,<0.5" eigen = "3.4.0.*" ezc3d = "1.5.9.*" fmt = "10.2.1.*" @@ -43,11 +44,6 @@ zlib = ">=1.2.13,<1.3" clean = { cmd = "rm -rf build && rm -rf .deps && rm -rf .pixi && rm pixi.lock" } create_deps_dir = { cmd = "mkdir -p .deps" } remove_deps_dir = { cmd = "rm -rf .deps" } -install_drjit = { cmd = "git clone --recursive https://github.com/mitsuba-renderer/drjit.git -b 'v0.4.4' --single-branch --depth 1 && cmake drjit -B drjit/build -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DDRJIT_ENABLE_JIT=ON -DDRJIT_ENABLE_AUTODIFF=OFF -DDRJIT_ENABLE_PYTHON=OFF && cmake --build drjit/build --target install --parallel && rm -rf drjit", cwd = ".deps", depends_on = [ - "create_deps_dir", -], outputs = [ - "$CONDA_PREFIX/share/cmake/drjit/drjitConfig.cmake", -] } install_OpenFBX = { cmd = "git clone https://github.com/nem0/OpenFBX.git && cd OpenFBX && git checkout 932dbba1fe38b821d4de9b9ba64070e00e65549f && cd .. && cmake OpenFBX -B OpenFBX/build -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DOFBX_DOUBLE_PRECISION=ON && cmake --build OpenFBX/build --target install --parallel && rm -rf OpenFBX", cwd = ".deps", depends_on = [ "create_deps_dir", ], outputs = [ @@ -59,7 +55,6 @@ install_sophus = { cmd = "git clone https://github.com/strasdat/Sophus.git -b '1 "$CONDA_PREFIX/share/sophus/cmake/SophusConfig.cmake", ] } install_deps = { depends_on = [ - "install_drjit", "install_OpenFBX", "install_sophus", "remove_deps_dir", @@ -101,7 +96,6 @@ sysroot_linux-64 = ">=2.28" [target.linux-64.tasks] lint = { cmd = "clang-format-18 -i axel/**/*.h axel/**/*.cpp momentum/**/*.h momentum/**/*.cpp pymomentum/**/*.h pymomentum/**/*.cpp" } install_deps = { depends_on = [ - "install_drjit", "install_OpenFBX", ] } build_pymomentum = { cmd = "pip install -e .", depends_on = ["install_deps"] } @@ -119,7 +113,6 @@ pytorch = ">=2.1.2,<2.2" [target.osx-arm64.tasks] install_deps = { depends_on = [ - "install_drjit", "install_OpenFBX", "install_sophus", "remove_deps_dir", @@ -138,11 +131,6 @@ build_pymomentum = { cmd = "pip install -e .", depends_on = ["install_deps"] } pytorch-cuda = ">=12.1,<13" [target.win-64.tasks] -install_drjit = { cmd = "git clone --recursive https://github.com/mitsuba-renderer/drjit.git -b 'v0.4.4' --single-branch --depth 1 && cmake drjit -B drjit/build -G 'Visual Studio 17 2022' -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDRJIT_ENABLE_JIT=ON -DDRJIT_ENABLE_AUTODIFF=OFF -DDRJIT_ENABLE_PYTHON=OFF && cmake --build drjit/build --target install --config Release --parallel && rm -rf drjit", cwd = ".deps", depends_on = [ - "create_deps_dir", -], outputs = [ - "$CONDA_PREFIX/share/cmake/drjit/drjitConfig.cmake", -] } install_OpenFBX = { cmd = "git clone https://github.com/nem0/OpenFBX.git && cd OpenFBX && git checkout 932dbba1fe38b821d4de9b9ba64070e00e65549f && cd .. && cmake OpenFBX -B OpenFBX/build -G 'Visual Studio 17 2022' -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DOFBX_DOUBLE_PRECISION=ON && cmake --build OpenFBX/build --target install --config Release --parallel && rm -rf OpenFBX", cwd = ".deps", depends_on = [ "create_deps_dir", ], outputs = [