Updated nix test to utilise nixgl for cuda library handling

CQCL · Oct 23, 2024 · 8525059 · 8525059
1 parent 1b9f7b5
commit 8525059
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 9 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,10 +7,13 @@
     cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=
     nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
   '';
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.tket.url = "github:CQCL/tket";
-  inputs.nixpkgs.follows = "tket/nixpkgs";
-  outputs = { self, nixpkgs, flake-utils, tket }:
+  inputs = {
+    flake-utils.url = "github:numtide/flake-utils";
+    tket.url = "github:CQCL/tket";
+    nixpkgs.follows = "tket/nixpkgs";
+    nixgl.url = "github:nix-community/nixGL";
+  };
+  outputs = { self, nixpkgs, flake-utils, tket, nixgl }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
@@ -20,6 +23,8 @@
             cudaSupport = true;
           };
           overlays = [
+            (nixgl.overlay)
+
             (self: super: {
               inherit (tket.packages."${system}") tket pytket;
             })

diff --git a/nix-support/pytket-cutensornet.nix b/nix-support/pytket-cutensornet.nix
@@ -55,12 +55,14 @@ EOF
       pytest
       pytest-lazy-fixture
     ]);
+    nixgl-bin = self.lib.getExe self.nixgl.auto.nixGLNvidia;
   in super.writeShellScriptBin "run-pytket-cutensornet-tests" ''
       HOME=$(mktemp -d);
       export HOME;
-      echo "---------------------------";
-      env;
-      echo "---------------------------";
+      NIXGL_PATH="$(${nixgl-bin} printenv LD_LIBRARY_PATH)";
+      WSL_PATH="/usr/lib/wsl/lib";
+      LD_LIBRARY_PATH="$NIXGL_PATH:$WSL_PATH:$LD_LIBRARY_PATH";
+      export LD_LIBRARY_PATH;
       ${test-env}/bin/pytest -s ${../tests};
   '';
 }