Deduplicate unsafe optimizations.

kurnevsky · Dec 12, 2024 · 683df92 · 683df92
1 parent c3f47ae
commit 683df92
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/flake.nix b/flake.nix
@@ -150,15 +150,12 @@
         })
       ];
       llamaOverride = pkgs: llama:
-        llama.overrideAttrs (old: {
-          postInstall = (old.postInstall or "") + ''
-            find $out/bin -type f ! -wholename '*/llama*' -exec ${pkgs.util-linux}/bin/rename "" 'llama-' {} \;
-          '';
-          NIX_CFLAGS_COMPILE = [ "-O3" "-march=native" "-mtune=native" ];
-          NIX_ENFORCE_NO_NATIVE = false;
-          preferLocalBuild = true;
-          allowSubstitutes = false;
-        });
+        import ./modules/with-native-optimizations.nix (llama.overrideAttrs
+          (old: {
+            postInstall = (old.postInstall or "") + ''
+              find $out/bin -type f ! -wholename '*/llama*' -exec ${pkgs.util-linux}/bin/rename "" 'llama-' {} \;
+            '';
+          }));
       llamaDefault = { pkgs, ... }: {
         environment.systemPackages = [
           (llamaOverride pkgs inputs.llama-cpp.packages.${pkgs.system}.default)

diff --git a/machines/pc/configuration.nix b/machines/pc/configuration.nix
@@ -37,10 +37,11 @@
 
   environment.systemPackages = with pkgs; [
     radeontop
-    (pkgs.callPackage ../../modules/stable-diffusion-cpp.nix {
-      useRocm = true;
-      gpuTargets = "gfx1100";
-    })
+    (import ../../modules/with-native-optimizations.nix
+      (pkgs.callPackage ../../modules/stable-diffusion-cpp.nix {
+        useRocm = true;
+        gpuTargets = "gfx1100";
+      }))
     ((python3.withPackages (pkgs:
       with pkgs; [
         # TODO: broken

diff --git a/modules/stable-diffusion-cpp.nix b/modules/stable-diffusion-cpp.nix
@@ -33,11 +33,6 @@ stdenv.mkDerivation {
     HIP_DEVICE_LIB_PATH = "${rocmPackages.rocm-device-libs}/amdgcn/bitcode";
   };
 
-  NIX_CFLAGS_COMPILE = [ "-O3" "-march=native" "-mtune=native" ];
-  NIX_ENFORCE_NO_NATIVE = false;
-  preferLocalBuild = true;
-  allowSubstitutes = false;
-
   meta = {
     description = "Stable Diffusion in pure C/C++";
     homepage = "https://github.com/leejet/stable-diffusion.cpp";

diff --git a/modules/with-native-optimizations.nix b/modules/with-native-optimizations.nix
@@ -0,0 +1,9 @@
+drv:
+
+drv.overrideAttrs (old: {
+  pname = old.pname + "-unsafe";
+  NIX_CFLAGS_COMPILE = [ "-O3" "-march=native" "-mtune=native" ];
+  NIX_ENFORCE_NO_NATIVE = false;
+  preferLocalBuild = true;
+  allowSubstitutes = false;
+})