13 Commits

Author SHA1 Message Date
4a6e36c7e9 Fix infiniband interface name
All checks were successful
CI / build:cross (pull_request) Successful in 8s
CI / build:all (pull_request) Successful in 16s
2026-01-08 14:33:44 +01:00
14fe50fc2a flake.lock: Update
Some checks failed
CI / build:all (pull_request) Failing after 1m45s
CI / build:cross (pull_request) Failing after 1m43s
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f?narHash=sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD%2B/cTUzzgVFoaHrkqY%3D' (2025-11-30)
  → 'github:NixOS/nixpkgs/3c9db02515ef1d9b6b709fc60ba9a540957f661c?narHash=sha256-2GffSfQxe3sedHzK%2BsTKlYo/NTIAGzbFCIsNMUPAAnk%3D' (2026-01-05)
2026-01-07 13:41:40 +01:00
178afc667e Remove conflicting definitions in amd-uprof-driver
See: https://lkml.org/lkml/2025/4/9/1709
2026-01-07 13:29:45 +01:00
596bf121a6 Mark mcxx as broken and remove from package list 2026-01-07 13:29:45 +01:00
1a8549064b Fix moved package linuxPackages.perf is now perf 2026-01-07 13:29:45 +01:00
54e9f0a561 Fix replaced nixseparatedebuginfod
nixseparatedebuginfod has been replaced by nixseparatedebuginfod2
2026-01-07 13:29:45 +01:00
e8702f49c3 Use standard gcc for intel packages
This reverts 26f52aa27d
2026-01-07 13:29:44 +01:00
c81813b0f8 Fix renamed option watchdog.runtimeTime
The option 'systemd.watchdog.runtimeTime' has been renamed to
'systemd.settings.Manager.RuntimeWatchdogSec'.
2026-01-07 13:29:44 +01:00
81114d55b8 Replace wrapGAppsHook with wrapGAppsHook3 2026-01-07 13:29:44 +01:00
f4bb3e7c17 Fix changed cudaPackages.cuda_cudart output
See: https://github.com/NixOS/nixpkgs/pull/437723
2026-01-07 13:29:44 +01:00
c80a855627 Set pyproject=true in buildPythonApplication
The buildPythonPackage and buildPythonApplication functions now
  require an explicit format attribute. Previously the default format
  used setuptools and called setup.py from the source tree, which is
  deprecated. The modern alternative is to configure pyproject = true
  with build-system = [ setuptools ].
2026-01-07 13:29:44 +01:00
e9a3a5ecc7 Fix renamed llvm bintools
Moved from llvmPackages_latest.tools.bintools to
llvmPackages_latest.bintools
2026-01-07 13:29:44 +01:00
272185d9b7 Upgrade nixpkgs to 25.11 2026-01-07 13:29:44 +01:00
10 changed files with 20 additions and 56 deletions

View File

@@ -4,6 +4,13 @@
# Use the GRUB 2 boot loader.
boot.loader.grub.enable = true;
# Enable GRUB2 serial console
boot.loader.grub.extraConfig = ''
serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
terminal_input --append serial
terminal_output --append serial
'';
boot.kernel.sysctl = {
"kernel.perf_event_paranoid" = lib.mkDefault "-1";

View File

@@ -11,11 +11,4 @@
"console=tty1"
"console=ttyS0,115200"
];
# Enable GRUB2 serial console
boot.loader.grub.extraConfig = ''
serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
terminal_input --append serial
terminal_output --append serial
'';
}

View File

@@ -1,6 +1,11 @@
{ pkgs, lib, ... }:
{ config, pkgs, lib, ... }:
{
# add the perf tool
environment.systemPackages = with pkgs; [
config.boot.kernelPackages.perf
];
# allow non-root users to read tracing data from the kernel
boot.kernel.sysctl."kernel.perf_event_paranoid" = -2;
boot.kernel.sysctl."kernel.kptr_restrict" = 0;

View File

@@ -3,13 +3,13 @@
{
imports = [
../common/base.nix
../common/xeon/console.nix
../module/amd-uprof.nix
../module/emulation.nix
../module/nvidia.nix
../module/slurm-client.nix
../module/hut-substituter.nix
./wireguard.nix
./serial-console.nix
];
# Don't turn off on August as UPC has different dates.
@@ -19,9 +19,6 @@
# Select the this using the ID to avoid mismatches
boot.loader.grub.device = "/dev/disk/by-id/wwn-0x500a07514b0c1103";
# Increase time so we can boot other entries
boot.loader.timeout = 60;
# No swap, there is plenty of RAM
swapDevices = lib.mkForce [];
@@ -34,10 +31,7 @@
# Use performance for benchmarks
powerManagement.cpuFreqGovernor = "performance";
# Enable amd-uprof in >= 6.15 kernels only
services.amd-uprof.enable =
let ver = config.boot.kernelPackages.kernel.version;
in (lib.strings.compareVersions ver "6.15") >= 0;
services.amd-uprof.enable = true;
# Disable NUMA balancing
boot.kernel.sysctl."kernel.numa_balancing" = 0;
@@ -48,11 +42,6 @@
# Disable NMI watchdog to save one hw counter (for AMD uProf)
boot.kernel.sysctl."kernel.nmi_watchdog" = 0;
specialisation.oldKernel.configuration = {
system.nixos.tags = [ "old-kernel" ];
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
};
services.openssh.settings.X11Forwarding = true;
services.fail2ban.enable = true;

View File

@@ -1,21 +0,0 @@
{
# Restart the serial console
systemd.services."serial-getty@ttyS1" = {
enable = true;
wantedBy = [ "getty.target" ];
serviceConfig.Restart = "always";
};
# Enable serial console
boot.kernelParams = [
"console=tty1"
"console=ttyS1,115200"
];
# Enable GRUB2 serial console
boot.loader.grub.extraConfig = ''
serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1
terminal_input --append serial
terminal_output --append serial
'';
}

View File

@@ -20,7 +20,7 @@
address = "10.0.40.1";
prefixLength = 24;
} ];
interfaces.ibs785.ipv4.addresses = [ {
interfaces.ibp5s0.ipv4.addresses = [ {
address = "10.0.42.1";
prefixLength = 24;
} ];

View File

@@ -21,7 +21,7 @@
prefixLength = 24;
} ];
# Watch out! The OmniPath device is not in the same place here:
interfaces.ibs801.ipv4.addresses = [ {
interfaces.ibp129s0.ipv4.addresses = [ {
address = "10.0.42.2";
prefixLength = 24;
} ];

View File

@@ -4,7 +4,6 @@
imports = [
../common/base.nix
../common/ssf/hosts.nix
../common/xeon/console.nix
../module/emulation.nix
../module/debuginfod.nix
../module/nvidia.nix

View File

@@ -27,7 +27,4 @@
};
};
};
# Allow gitea user to send mail
users.users.gitea.extraGroups = [ "mail-robot" ];
}

View File

@@ -9,15 +9,13 @@
, nanos6
, nodes
, nosv
, mkl
, mpi
, tampi
, openblas
, ovni
, gitBranch ? "master"
, gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
, gitCommit ? "fe30c2cfe36b535ef26a0054e010bc005e88ba04"
, useMkl ? true
, gitCommit ? "bf29a53113737c3aa74d2fe3d55f59868faea7b4"
}:
stdenv.mkDerivation rec {
@@ -44,13 +42,10 @@ stdenv.mkDerivation rec {
nosv
mpi
tampi
ovni
] ++ (if (useMkl) then [
mkl
] else [
openblas
openblas.dev
]);
ovni
];
env = {
NANOS6_HOME = nanos6;