feat: First working version of Bayes3D in Ipynb

chi-collective · Jul 9, 2024 · 9c31e28 · 9c31e28
1 parent 66ff185
commit 9c31e28
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 70 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,7 +5,7 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
 
-    nixpkgs.url = "github:zimbatm/nixpkgs?ref=jax-fixes";
+    nixpkgs.url = "github:NixOS/nixpkgs?ref=d8724afca4565614164dd81345f6137c4c6eab21";
     nixpkgs-llvm-10.url = "github:NixOS/nixpkgs?rev=222c1940fafeda4dea161858ffe6ebfc853d3db5";
 
     genjax.url = "github:probcomp/genjax?ref=v0.1.1";
@@ -134,30 +134,28 @@
         inherit packages;
 
         legacyPackages.python3Packages = 
-        (pkgs.python3Packages.overrideScope pythonOverrides).overrideScope (super: superPython:
+        (pkgs.python311Packages.overrideScope pythonOverrides).overrideScope (super: superPython:
           loadPackages super.callPackage ./pkgs/python-modules
         );
 
         devShells.default = pkgs.mkShell {
-          packages = with pkgs; [
+          packages = [
             self'.legacyPackages.python3Packages.python-lsp-server
-            (python3.withPackages (ps: with self'.legacyPackages.python3Packages; [
-              jupyter
-              bayes3d
-              jax
-              scipy
-              pyransac3d
+            (self'.legacyPackages.python3Packages.python.withPackages (p: [
+              self'.legacyPackages.python3Packages.bayes3d
+              self'.legacyPackages.python3Packages.jax
+              p.jupyter
+              p.scipy
             ]))
           ];
 
           shellHook = ''
             export EXTRA_LDFLAGS="-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib"
             export EXTRA_CCFLAGS="-I/usr/include"
             export CUDA_PATH=${pkgs.cudatoolkit_11}
-            export B3D_ASSETS_PATH="${bayes3d.src}/assets"
+            export B3D_ASSET_PATH="${bayes3d.src}/assets"
 
             jupyter notebook
-            exit
           '';
         };
       };

diff --git a/notebooks/assets/.gitkeep b/notebooks/assets/.gitkeep
diff --git a/notebooks/demo.ipynb b/notebooks/demo.ipynb
diff --git a/pkgs/python-modules/distinctipy/default.nix b/pkgs/python-modules/distinctipy/default.nix
@@ -1,5 +1,4 @@
 { fetchPypi
-, python3Packages
 , buildPythonPackage
 , setuptools
 , numpy

diff --git a/pkgs/python-modules/open3d/default.nix b/pkgs/python-modules/open3d/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , pkgs
-, python3Packages
 , fetchPypi
 , fetchurl
 
@@ -10,9 +9,21 @@
 , zip
 
 , autoPatchelfHook
+, python
 , tensorflow-bin
 , libusb
 , cudaPackages_11
+, buildPythonPackage
+, ipywidgets
+, matplotlib
+, numpy
+, pandas
+, plyfile
+, pytorchWithCuda
+, pyyaml
+, scikitlearn
+, scipy
+, tqdm
 
 , libGL
 , libglvnd
@@ -24,20 +35,6 @@
 , runCommand
 }:
 let
-  inherit (python3Packages)
-    buildPythonPackage
-    ipywidgets
-    matplotlib
-    numpy
-    pandas
-    plyfile
-    pytorchWithCuda
-    pyyaml
-    scikitlearn
-    scipy
-    tqdm
-  ;
-
   libllvm-wrapped = 
   let
     libllvm = llvmPackages_10.libllvm.lib;
@@ -141,7 +138,7 @@ let
     };
   };
 
-  pyVersion = lib.versions.majorMinor python3Packages.python.version;
+  pyVersion = lib.versions.majorMinor python.version;
   srcInputs = prebuiltSrcs."${pyVersion}-${stdenv.system}" or (throw "open3d-bin for Python version '${pyVersion}' is not supported on '${stdenv.system}'");
 
   src = fetchPypi rec {

diff --git a/pkgs/python-modules/parsable/default.nix b/pkgs/python-modules/parsable/default.nix
@@ -1,8 +1,8 @@
 {
   fetchPypi,
-  python3Packages
+  buildPythonPackage
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "parsable";
   version = "0.3.1";
   format = "setuptools";

diff --git a/pkgs/python-modules/pymetis/default.nix b/pkgs/python-modules/pymetis/default.nix
@@ -1,7 +1,8 @@
 { fetchPypi
-, python3Packages
+, buildPythonPackage
+, pybind11
 }:
-python3Packages.buildPythonPackage rec {
+buildPythonPackage rec {
   pname = "PyMetis";
   version = "2023.1.1";
   format = "setuptools";
@@ -14,6 +15,6 @@ python3Packages.buildPythonPackage rec {
   doCheck = false;
 
   nativeBuildInputs = [
-    python3Packages.pybind11
+    pybind11
   ];
 }
diff --git a/pkgs/python-modules/pyransac3d/default.nix b/pkgs/python-modules/pyransac3d/default.nix
@@ -1,6 +1,9 @@
 { fetchFromGitHub
 , python3
 , buildPythonPackage
+, setuptools
+, wheel
+, numpy
 }:
 # TODO: upstream me
 buildPythonPackage rec {
@@ -16,11 +19,11 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    python3.pkgs.setuptools
-    python3.pkgs.wheel
+    setuptools
+    wheel
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     numpy
   ];