packages.ufo: fix

2026-01-12 04:19:22 +08:00 · 2024-08-11 18:01:46 +08:00
parent 536de32207
commit c03d217f73
8 changed files with 57 additions and 66 deletions
--- a/flake.nix
+++ b/flake.nix
@@ -76,54 +76,49 @@
        (builtins.attrNames (builtins.readDir ./devices));
    in
    {
-      packages = rec
+      packages.x86_64-linux = rec
      {
-        x86_64-linux = rec
+        pkgs = (import inputs.nixpkgs
        {
-          pkgs = (import inputs.nixpkgs
+          system = "x86_64-linux";
+          config.allowUnfree = true;
+          overlays = [ inputs.self.overlays.default ];
+          crossOverlays = [(final: prev:
          {
-            system = "x86_64-linux";
-            config.allowUnfree = true;
-            overlays = [ inputs.self.overlays.default ];
-            crossOverlays = [(final: prev:
+            boost = prev.boost.override { zstd = null; };
+            magic-enum = prev.magic-enum.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++
+              [ "-DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF" "-DMAGIC_ENUM_OPT_BUILD_TESTS=OFF" ]; });
+            range-v3 = prev.range-v3.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++
+              [ "-DRANGE_V3_DOCS=OFF" "-DRANGE_V3_TESTS=OFF" "-DRANGE_V3_EXAMPLES=OFF" ]; });
+            abseil-cpp = prev.abseil-cpp.overrideAttrs (prev: { buildInputs = prev.buildInputs ++
+              [ final.windows.pthreads ]; });
+          })];
+        });
+        default = inputs.nixpkgs.legacyPackages.x86_64-linux.writeText "systems"
+          (builtins.concatStringsSep "\n" (builtins.map
+            (system: builtins.toString inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel)
+            devices));
+        hpcstat =
+          let
+            openssh = (pkgs.pkgsStatic.openssh.override { withLdns = false; etcDir = null; }).overrideAttrs
+              (prev: { doCheck = false; patches = prev.patches ++ [ ./packages/hpcstat/openssh.patch ];});
+            duc = pkgs.pkgsStatic.duc.override { enableCairo = false; cairo = null; pango = null; };
+          in pkgs.pkgsStatic.localPackages.hpcstat.override
+            { inherit openssh duc; standalone = true; version = inputs.self.rev or "dirty"; };
+        ufo =
+          let
+            range-v3 = pkgs.pkgsStatic.range-v3.overrideAttrs (prev:
            {
-              boost = prev.boost.override { zstd = null; };
-              magic-enum = prev.magic-enum.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++
-                [ "-DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF" "-DMAGIC_ENUM_OPT_BUILD_TESTS=OFF" ]; });
-              range-v3 = prev.range-v3.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++
-                [ "-DRANGE_V3_DOCS=OFF" "-DRANGE_V3_TESTS=OFF" "-DRANGE_V3_EXAMPLES=OFF" ]; });
-              abseil-cpp = prev.abseil-cpp.overrideAttrs (prev: { buildInputs = prev.buildInputs ++
-                [ final.windows.pthreads ]; });
-            })];
-          });
-          default = inputs.nixpkgs.legacyPackages.x86_64-linux.writeText "systems"
-            (builtins.concatStringsSep "\n" (builtins.map
-              (system: builtins.toString inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel)
-              devices));
-          hpcstat =
-            let
-              openssh = (pkgs.pkgsStatic.openssh.override { withLdns = false; etcDir = null; }).overrideAttrs
-                (prev: { doCheck = false; patches = prev.patches ++ [ ./packages/hpcstat/openssh.patch ];});
-              duc = pkgs.pkgsStatic.duc.override { enableCairo = false; cairo = null; pango = null; };
-            in pkgs.pkgsStatic.localPackages.hpcstat.override
-              { inherit openssh duc; standalone = true; version = inputs.self.rev or "dirty"; };
-          ufo = pkgs.pkgsStatic.localPackages.ufo.override { version = inputs.self.rev or "dirty"; };
-          chn-bsub = pkgs.pkgsStatic.localPackages.chn-bsub;
-        }
-        // (
-          builtins.listToAttrs (builtins.map
-            (system:
-            {
-              name = system;
-              value = inputs.self.outputs.nixosConfigurations.${system}.config.system.build.toplevel;
-            })
-            devices)
-          );
-        x86_64-w64-mingw32 = rec
-        {
-          pkgs = x86_64-linux.pkgs.pkgsCross.mingwW64Static;
-          winjob = pkgs.localPackages.winjob;
-        };
+              cmakeFlags = prev.cmakeFlags or []
+                ++ [ "-DRANGE_V3_DOCS=OFF" "-DRANGE_V3_TESTS=OFF" "-DRANGE_V3_EXAMPLES=OFF" ];
+              doCheck = false;
+            });
+            tbb = pkgs.pkgsStatic.tbb_2021_11.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags or [] ++
+              [ "-DTBB_TEST=OFF" ]; });
+            biu = pkgs.pkgsStatic.localPackages.biu.override { inherit range-v3; };
+            matplotplusplus = pkgs.pkgsStatic.localPackages.matplotplusplus.override { libtiff = null; };
+          in pkgs.pkgsStatic.localPackages.ufo.override { inherit biu tbb matplotplusplus; };
+        chn-bsub = pkgs.pkgsStatic.localPackages.chn-bsub;
      };
      nixosConfigurations =
      (
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -9,8 +9,7 @@ inputs: rec
  concurrencpp = inputs.pkgs.callPackage ./concurrencpp.nix { src = inputs.topInputs.concurrencpp; };
  eigengdb = inputs.pkgs.python3Packages.callPackage ./eigengdb.nix {};
  nodesoup = inputs.pkgs.callPackage ./nodesoup.nix { src = inputs.topInputs.nodesoup; };
-  matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus.nix
-    { inherit nodesoup glad; src = inputs.topInputs.matplotplusplus; };
+  matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus.nix { src = inputs.topInputs.matplotplusplus; };
  zpp-bits = inputs.pkgs.callPackage ./zpp-bits.nix { src = inputs.topInputs.zpp-bits; };
  eigen = inputs.pkgs.callPackage ./eigen.nix { src = inputs.topInputs.eigen; };
  nameof = inputs.pkgs.callPackage ./nameof.nix { src = inputs.topInputs.nameof; };
@@ -68,7 +67,7 @@ inputs: rec
  mkPnpmPackage = inputs.pkgs.callPackage ./mkPnpmPackage.nix {};
  sbatch-tui = inputs.pkgs.callPackage ./sbatch-tui { inherit biu; };
  ufo = inputs.pkgs.callPackage ./ufo
-    { inherit concurrencpp biu glad matplotplusplus zpp-bits; tbb = inputs.pkgs.tbb_2021_11; };
+    { inherit concurrencpp biu matplotplusplus zpp-bits; tbb = inputs.pkgs.tbb_2021_11; };
  chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; };
  winjob = inputs.pkgs.callPackage ./winjob { stdenv = inputs.pkgs.gcc14Stdenv; };
  sockpp = inputs.pkgs.callPackage ./sockpp.nix { src = inputs.topInputs.sockpp; };
--- a/packages/matplotplusplus.nix
+++ b/packages/matplotplusplus.nix
@@ -1,18 +1,11 @@
 {
-  stdenv, src, cmake, pkg-config, substituteAll,
-  gnuplot, libjpeg, libtiff, zlib, libpng, lapack, blas, fftw, opencv, nodesoup, cimg, glfw, libGL, python3, glad
+  stdenv, src, cmake, pkg-config,
+  libjpeg, libtiff, zlib, libpng
 }: stdenv.mkDerivation
 {
  name = "matplotplusplus";
  inherit src;
-  cmakeFlags =
-  [
-    "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF"
-    "-DMATPLOTPP_WITH_SYSTEM_NODESOUP=ON" "-DMATPLOTPP_WITH_SYSTEM_CIMG=ON"
-    "-DMATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND=ON" "-DGLAD_REPRODUCIBLE=ON"
-  ];
-  buildInputs = [ gnuplot libjpeg libtiff zlib libpng lapack blas fftw opencv nodesoup cimg glfw libGL glad ];
-  nativeBuildInputs = [ cmake pkg-config python3 ];
-  propagatedBuildInputs = [ libGL glad glfw ];
-  propagatedNativeBuildInputs = [ python3 ];
+  cmakeFlags = [ "-DMATPLOTPP_BUILD_EXAMPLES=OFF" "-DMATPLOTPP_BUILD_TESTS=OFF" ];
+  buildInputs = [ libjpeg libtiff zlib libpng ];
+  nativeBuildInputs = [ cmake pkg-config ];
 }
--- a/packages/ufo/.clangd
+++ b/packages/ufo/.clangd
@@ -0,0 +1,3 @@
+CompileFlags:
+  Add: [ -Wall, -Wextra, -std=c++26 ]
+  Compiler: g++
--- a/packages/ufo/.envrc
+++ b/packages/ufo/.envrc
@@ -0,0 +1 @@
+use flake .#ufo
--- a/packages/ufo/CMakeLists.txt
+++ b/packages/ufo/CMakeLists.txt
@@ -15,15 +15,13 @@ find_package(fmt REQUIRED)
 find_package(concurrencpp REQUIRED)
 find_package(HighFive REQUIRED)
 find_package(TBB REQUIRED)
-find_package(glad REQUIRED)
 find_package(Matplot++ REQUIRED)
 find_path(ZPP_BITS_INCLUDE_DIR zpp_bits.h REQUIRED)

 add_executable(ufo src/solver.cpp src/fold.cpp src/unfold.cpp src/plot.cpp src/main.cpp)
 target_include_directories(ufo PRIVATE ${PROJECT_SOURCE_DIR}/include ${ZPP_BITS_INCLUDE_DIR})
 target_link_libraries(ufo PRIVATE
-  yaml-cpp Eigen3::Eigen fmt::fmt concurrencpp::concurrencpp HighFive_HighFive TBB::tbb Matplot++::matplot
-  Matplot++::matplot_opengl)
+  yaml-cpp Eigen3::Eigen fmt::fmt concurrencpp::concurrencpp HighFive_HighFive TBB::tbb Matplot++::matplot)
 target_compile_features(ufo PRIVATE cxx_std_23)

 install(TARGETS ufo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
--- a/packages/ufo/default.nix
+++ b/packages/ufo/default.nix
@@ -1,10 +1,10 @@
 {
-  stdenv, cmake, pkg-config,
-  yaml-cpp, eigen, fmt, concurrencpp, highfive, tbb, glad, matplotplusplus, biu, zpp-bits
+  stdenv, cmake, pkg-config, version ? null,
+  yaml-cpp, eigen, fmt, concurrencpp, highfive, tbb, matplotplusplus, biu, zpp-bits
 }: stdenv.mkDerivation
 {
  name = "ufo";
  src = ./.;
-  buildInputs = [ yaml-cpp eigen fmt concurrencpp highfive tbb glad matplotplusplus biu zpp-bits ];
+  buildInputs = [ yaml-cpp eigen fmt concurrencpp highfive tbb matplotplusplus biu zpp-bits ];
  nativeBuildInputs = [ cmake pkg-config ];
 }
--- a/packages/ufo/include/ufo/solver.hpp
+++ b/packages/ufo/include/ufo/solver.hpp
@@ -22,7 +22,6 @@
 # include <highfive/H5File.hpp>
 # include <zpp_bits.h>
 # include <matplot/matplot.h>
-# include <matplot/backend/opengl.h>

 // 在相位中, 约定为使用 $\exp (2 \pi i \vec{q} \cdot \vec{r})$ 来表示原子的运动状态
 //  (而不是 $\exp (-2 \pi i \vec{q} \cdot \vec{r})$)
@@ -31,6 +30,9 @@

 namespace Eigen
 {
+  // template <typename Scalar, int Rows, int Cols> constexpr inline auto serialize
+  //   (auto & archive, Eigen::Matrix<Scalar, Rows, Cols>& matrix)
+  //   { return archive(std::span(matrix.data(), matrix.size())); }
  constexpr inline auto serialize(auto & archive, Eigen::Matrix3d& matrix)
    { return archive(std::span(matrix.data(), matrix.size())); }
  constexpr inline auto serialize(auto & archive, const Eigen::Matrix3d& matrix)