Use drjit-cpp package of Pixi

Summary: DrJit was added by conda-forge/staged-recipes#26734 Differential Revision: D58916198
facebookincubator · Jun 22, 2024 · 5a3bd3d · 5a3bd3d
1 parent 1ce0df7
commit 5a3bd3d
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 13 deletions.
diff --git a/pixi.lock b/pixi.lock
diff --git 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 = [