rarias/bscpkgs
rarias/bscpkgs
Archived
2
0
Fork 3
Code Issues 2 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Update to nixos 25.05 and OmpSs-2 2025-06 #5

Closed
rarias wants to merge 0 commits from update-ompss-2025-06 into master
pull from: update-ompss-2025-06
merge into: rarias:master
Conversation 10 Commits - Files Changed -
rarias commented 2025-07-18 16:32:30 +02:00
Owner
Copy Link

Upgrades nixpkgs to NixOS 25.05 using the same commit we use in jungle for the system packages. It also upgrades OmpSs-2 packages to the latest release.

Unfortunately, GPI-2 (GASPI) is failing to build due to a missing definition in rdma-core. It can be fixed, but for now I will drop GPI-2 and TAGASPI. See #7

Fixes #8 and #9

Upgrades nixpkgs to NixOS 25.05 using the same commit we use in jungle for the system packages. It also upgrades OmpSs-2 packages to the latest release. Unfortunately, GPI-2 (GASPI) is failing to build due to a missing definition in rdma-core. It can be fixed, but for now I will drop GPI-2 and TAGASPI. See https://jungle.bsc.es/git/rarias/bscpkgs/issues/7 Fixes #8 and #9
rarias added 6 commits 2025-07-18 16:32:31 +02:00 
Flake lock file updates:

• Updated input 'nixpkgs':
    'path:/nix/store/2csx2kkb2hxyxhhmg2xs9jfyypikwwk6-source?lastModified=1736867362&narHash=sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8%3D&rev=9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc' (2025-01-14)
  → 'path:/nix/store/zk8v61cpk1wprp9ld5ayc1g5fq4pdkwv-source?lastModified=1752436162&narHash=sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw%3D&rev=dfcd5b901dbab46c9c6e80b265648481aafb01f8' (2025-07-13)
abonerib added a new dependency 2025-07-21 12:46:17 +02:00
#6 Update paraver to 4.12.0
rarias added 3 commits 2025-07-21 13:15:50 +02:00 
In the future, we may want to look if those symlinks are needed.
GPI-2 fails to build, which is needed for TAGASPI.
rarias added 2 commits 2025-07-21 16:29:49 +02:00 
We need to add the gcc in the PATH, but adding it directly to $PATH
doesn't work, as it will be restored to $path_backup before icc runs. So
for now we simply inject it to path_backup, but ideally we should find a
more robust solution.
Intel compiler for C++ (icpc) is not able to parse the location of C++
headers from the output of gcc 14, but works fine for gcc 13.
rarias commented 2025-07-21 16:31:35 +02:00
Author
Owner
Copy Link

Managed to fix all packages and tests (ignoring GPI-2 and TAGASPI).

hut% nix build -vL .#bsc-ci.all --print-out-paths
/nix/store/0ifyfdldpbrwkzi5asnkfgk68f8qrr7r-ci-all
Managed to fix all packages and tests (ignoring GPI-2 and TAGASPI). ``` hut% nix build -vL .#bsc-ci.all --print-out-paths /nix/store/0ifyfdldpbrwkzi5asnkfgk68f8qrr7r-ci-all ```
rarias changed title from WIP: Update to nixos 25.05 and OmpSs-2 2025-06 to Update to nixos 25.05 and OmpSs-2 2025-06 2025-07-21 16:34:47 +02:00
rarias requested review from arocanon 2025-07-21 16:35:26 +02:00
rarias requested review from abonerib 2025-07-21 16:35:27 +02:00
abonerib reviewed 2025-07-21 16:57:32 +02:00
pkgs/intel-oneapi/2023.nix Outdated
@ -14,3 +14,3 @@
, libfabric
, gcc
, gcc13
, gcc7
abonerib commented 2025-07-21 16:50:36 +02:00
Collaborator

We can probably remove gcc7

We can probably remove `gcc7`
abonerib commented 2025-07-21 16:55:37 +02:00
Collaborator

Also linuxHeaders, symlinkJoin and ncurses

Also `linuxHeaders`, `symlinkJoin` and `ncurses`
👍 1
rarias marked this conversation as resolved
pkgs/intel-oneapi/2023.nix Outdated
@ -411,3 +414,3 @@
icx-wrapper = wrapIntel rec {
cc = intel-compiler;
mygcc = gcc;
mygcc = gcc13;
abonerib commented 2025-07-21 16:51:05 +02:00
Collaborator

It may be cleaner to put gcc = gcc13 in the top level let and leave all the wrapIntel calls as is.

It may be cleaner to put `gcc = gcc13` in the top level let and leave all the `wrapIntel` calls as is.
👍 1
rarias marked this conversation as resolved
rarias force-pushed update-ompss-2025-06 from 1c56367446 to f0afa10462 2025-07-21 17:03:01 +02:00 Compare
abonerib approved these changes 2025-07-21 17:13:25 +02:00
Dismissed
abonerib left a comment
Collaborator

LGTM

LGTM
rarias force-pushed update-ompss-2025-06 from f0afa10462 to fece91e756 2025-07-21 17:19:46 +02:00 Compare
rarias commented 2025-07-21 17:27:36 +02:00
Author
Owner
Copy Link

This branch is out-of-date with the base branch

I missed this, it actually fails on rebase because I added tagaspi in bench6. I will need to drop it from the inputs as well.

> This branch is out-of-date with the base branch I missed this, it actually fails on rebase because I added tagaspi in bench6. I will need to drop it from the inputs as well.
rarias commented 2025-07-21 17:29:44 +02:00
Author
Owner
Copy Link

Also lmbench fails:

error: builder for '/nix/store/v2a8skc3zkzj676sllimx142n2ffckmy-lmbench-941a0dcc.drv' failed with exit code 2;
       last 23 log lines:
       > Running phase: unpackPhase
       > unpacking source archive /nix/store/0qrsx7fl7npkkm6b2y0fyrx9hw7417yz-source
       > source root is source
       > Running phase: patchPhase
       > applying patch /nix/store/ijl1sxdj4v8dh4hgq0ignlmdcy8zszqp-fix-install.patch
       > patching file Makefile
       > Running phase: updateAutotoolsGnuConfigScriptsPhase
       > Running phase: configurePhase
       > no configure script, doing nothing
       > Running phase: buildPhase
       > build flags: SHELL=/nix/store/ih68ar79msmj0496pgld4r3vqfr7bbin-bash-5.2p37/bin/bash BASE=/nix/store/rascf530gcfydy76hl6i8a1xdghllxig-lmbench-941a0dcc CPPFLAGS=-I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc LDFLAGS=-ltirpc
       > make[1]: Entering directory '/build/source/src'
       > gcc -O -DSYS5 -Dvalloc=malloc -DS_IFIFO=S_IFFIFO -I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc -ltirpc -c lib_tcp.c -o ../bin/x86_64-linux-gnu/lib_tcp.o
       > gcc -O -DSYS5 -Dvalloc=malloc -DS_IFIFO=S_IFFIFO -I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc -ltirpc -c lib_udp.c -o ../bin/x86_64-linux-gnu/lib_udp.o
       > gcc -O -DSYS5 -Dvalloc=malloc -DS_IFIFO=S_IFFIFO -I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc -ltirpc -c lib_unix.c -o ../bin/x86_64-linux-gnu/lib_unix.o
       > gcc -O -DSYS5 -Dvalloc=malloc -DS_IFIFO=S_IFFIFO -I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc -ltirpc -c lib_timing.c -o ../bin/x86_64-linux-gnu/lib_timing.o
       > lib_timing.c: In function 'touch':
       > lib_timing.c:1626:17: error: type defaults to 'int' in declaration of 'psize' [-Wimplicit-int]
       >  1626 |         static  psize;
       >       |                 ^~~~~
       > make[1]: *** [Makefile:243: ../bin/x86_64-linux-gnu/lib_timing.o] Error 1
       > make[1]: Leaving directory '/build/source/src'
       > make: *** [Makefile:114: lmbench] Error 2
       For full logs, run:
         nix log /nix/store/v2a8skc3zkzj676sllimx142n2ffckmy-lmbench-941a0dcc.drv
Also lmbench fails: ``` error: builder for '/nix/store/v2a8skc3zkzj676sllimx142n2ffckmy-lmbench-941a0dcc.drv' failed with exit code 2; last 23 log lines: > Running phase: unpackPhase > unpacking source archive /nix/store/0qrsx7fl7npkkm6b2y0fyrx9hw7417yz-source > source root is source > Running phase: patchPhase > applying patch /nix/store/ijl1sxdj4v8dh4hgq0ignlmdcy8zszqp-fix-install.patch > patching file Makefile > Running phase: updateAutotoolsGnuConfigScriptsPhase > Running phase: configurePhase > no configure script, doing nothing > Running phase: buildPhase > build flags: SHELL=/nix/store/ih68ar79msmj0496pgld4r3vqfr7bbin-bash-5.2p37/bin/bash BASE=/nix/store/rascf530gcfydy76hl6i8a1xdghllxig-lmbench-941a0dcc CPPFLAGS=-I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc LDFLAGS=-ltirpc > make[1]: Entering directory '/build/source/src' > gcc -O -DSYS5 -Dvalloc=malloc -DS_IFIFO=S_IFFIFO -I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc -ltirpc -c lib_tcp.c -o ../bin/x86_64-linux-gnu/lib_tcp.o > gcc -O -DSYS5 -Dvalloc=malloc -DS_IFIFO=S_IFFIFO -I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc -ltirpc -c lib_udp.c -o ../bin/x86_64-linux-gnu/lib_udp.o > gcc -O -DSYS5 -Dvalloc=malloc -DS_IFIFO=S_IFFIFO -I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc -ltirpc -c lib_unix.c -o ../bin/x86_64-linux-gnu/lib_unix.o > gcc -O -DSYS5 -Dvalloc=malloc -DS_IFIFO=S_IFFIFO -I/nix/store/xq7giq0xnwjhyiy9dabjgkbzic2vv6g2-libtirpc-1.3.6-dev/include/tirpc -ltirpc -c lib_timing.c -o ../bin/x86_64-linux-gnu/lib_timing.o > lib_timing.c: In function 'touch': > lib_timing.c:1626:17: error: type defaults to 'int' in declaration of 'psize' [-Wimplicit-int] > 1626 | static psize; > | ^~~~~ > make[1]: *** [Makefile:243: ../bin/x86_64-linux-gnu/lib_timing.o] Error 1 > make[1]: Leaving directory '/build/source/src' > make: *** [Makefile:114: lmbench] Error 2 For full logs, run: nix log /nix/store/v2a8skc3zkzj676sllimx142n2ffckmy-lmbench-941a0dcc.drv ```
rarias force-pushed update-ompss-2025-06 from fece91e756 to 24326d4fce 2025-07-21 17:55:03 +02:00 Compare
rarias commented 2025-07-21 17:55:33 +02:00
Author
Owner
Copy Link

Sorry for the noise, should be good now:

hut% nix build '.#bsc-ci.all' --print-out-paths
/nix/store/b6jnsv4yrq9kb7qg8kxkb3593xi961ma-ci-all
Sorry for the noise, should be good now: ``` hut% nix build '.#bsc-ci.all' --print-out-paths /nix/store/b6jnsv4yrq9kb7qg8kxkb3593xi961ma-ci-all ```
rarias requested review from abonerib 2025-07-21 17:55:39 +02:00
abonerib approved these changes 2025-07-21 17:59:36 +02:00
rarias force-pushed update-ompss-2025-06 from 24326d4fce to 974bb56dc3 2025-07-21 18:02:15 +02:00 Compare
rarias closed this pull request 2025-07-21 18:03:52 +02:00
rarias commented 2025-07-21 18:04:35 +02:00
Author
Owner
Copy Link

Merged in 974bb56dc3, not sure why Gitea sometimes is not able to detect it.

Merged in https://jungle.bsc.es/git/rarias/bscpkgs/commit/974bb56dc38b408fda9ee296f2595306e68bf88d, not sure why Gitea sometimes is not able to detect it.
abonerib commented 2025-07-23 18:31:33 +02:00
Collaborator
Copy Link

Merged in 974bb56dc3, not sure why Gitea sometimes is not able to detect it.

Do we have autodetect enabled in the repo?

image

If so, maybe we can enable the manual merge option which to my understanding allows to mark the PR as merged by telling gitea which commit merged it

> Merged in https://jungle.bsc.es/git/rarias/bscpkgs/commit/974bb56dc38b408fda9ee296f2595306e68bf88d, not sure why Gitea sometimes is not able to detect it. Do we have autodetect enabled in the repo? <img width="627" alt="image" src="attachments/e3dede2c-a113-419c-81d1-f60637fb2ccc"> If so, maybe we can enable the manual merge option which to my understanding allows to mark the PR as merged by telling gitea which commit merged it
image.png
50 KiB
rarias commented 2025-07-24 11:20:18 +02:00
Author
Owner
Copy Link

Oops, I had those options disabled, I enabled them. In jungle they were already enabled, maybe that's why it was working there. Thanks!

Oops, I had those options disabled, I enabled them. In jungle they were already enabled, maybe that's why it was working there. Thanks!
This repo is archived. You cannot comment on pull requests.
Reviewers
No Reviewers
arocanon
abonerib
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
abonerib arocanon rarias
No Assignees
2 Participants
Due Date
No due date set.
Blocks
#6 Update paraver to 4.12.0
rarias/bscpkgs
Reference: rarias/bscpkgs#5
No description provided.
Delete Branch "update-ompss-2025-06"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?