public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/lammps] f44: Version bump to 20260704
@ 2026-07-28 2:09 Richard Berger
0 siblings, 0 replies; only message in thread
From: Richard Berger @ 2026-07-28 2:09 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/lammps
Branch : f44
Commit : 1ad5268edb80b237c8e7b43b7b61a65ea6728f30
Author : Richard Berger <richard.berger@outlook.com>
Date : 2026-07-25T20:43:24-06:00
Stats : +16/-58 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/lammps/c/1ad5268edb80b237c8e7b43b7b61a65ea6728f30?branch=f44
Log:
Version bump to 20260704
- Latest LAMMPS release
- Bump Kokkos requirement to 5.1
- Remove patches that have been upstreamed
- Disable Random test due to failures with OpenMPI
- Disable MolPairStyle:e3b test due to aarch64 failures
---
diff --git a/lammps.spec b/lammps.spec
index f60a782..2b7f411 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,5 +1,5 @@
%global git 0
-%global commit fc6a61720c42604466e626763af66feefde23646
+%global commit b54f0e7b0fb0003d6cec2e53c3b222211f4915c0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
@@ -13,9 +13,9 @@
Name: lammps
%if %{git}
-Version: 20260330^%{shortcommit}
+Version: 20260704^%{shortcommit}
%else
-Version: 20260330
+Version: 20260704
%endif
%global uversion %(v=%{version}; \
patch=${v##*.}; [[ $v = $patch ]] && patch= \
@@ -39,9 +39,7 @@ Source2: https://pyyaml.org/download/libyaml/yaml-0.2.5.tar.gz
Source3: https://download.lammps.org/thirdparty/opencl-loader-2024.05.09.tar.gz
Source4: https://github.com/spglib/spglib/archive/refs/tags/v1.11.2.1.tar.gz#/spglib-1.11.2.1.tar.gz
# fixed in https://github.com/lammps/lammps/pull/4950
-Patch0: unittest_fix.patch
-Patch1: unittest_fix2.patch
-Patch2: ignore-tests-with-kokkos-openmp.patch
+Patch0: ignore-tests-with-kokkos-openmp.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
# mpi is broken on s390x see, bug #2322073
@@ -83,7 +81,7 @@ BuildRequires: readline-devel
%global with_kokkos 1
# kokkos needs a lot of memory
%global _smp_mflags -j1
-BuildRequires: kokkos-devel >= 5.0
+BuildRequires: kokkos-devel >= 5.1
%endif
%endif
Requires: %{name}-data
@@ -284,14 +282,14 @@ cd python
%check
-%global testargs --label-exclude unstable --exclude-regex '\(SimpleCommands\|Variables\|ComputeGlobal\|MolPairStyle:coul_slater_long\|AtomicPairStyle:meam_spline\|FixTimestep:.*\|.*tip4p.*\|FFT3D\)'
+%global testargs --label-exclude unstable --exclude-regex '\(Random\|SimpleCommands\|Variables\|ComputeGlobal\|MolPairStyle:e3b\|MolPairStyle:coul_slater_long\|AtomicPairStyle:meam_spline\|FixTimestep:.*\|.*tip4p.*\|FFT3D\)'
%ifnarch %ix86
-%global testargs --label-exclude unstable --exclude-regex '\(SimpleCommands\|Variables\|ComputeGlobal\|MolPairStyle:coul_slater_long\|AtomicPairStyle:meam_spline\|FixTimestep:.*\|.*tip4p.*\|Groups\|AtomicPairStyle:lj_cut_sphere\|AtomicPairStyle:lj_expand_sphere\|AtomicPairStyle:meam_ms\|AtomicPairStyle:pedone\|DihedralStyle:cosine_squared_restricted\|BondStyle:harmonic_restrain\|FFT3D\)'
+%global testargs --label-exclude unstable --exclude-regex '\(Random\|SimpleCommands\|Variables\|ComputeGlobal\|MolPairStyle:e3b\|MolPairStyle:coul_slater_long\|AtomicPairStyle:meam_spline\|FixTimestep:.*\|.*tip4p.*\|Groups\|AtomicPairStyle:lj_cut_sphere\|AtomicPairStyle:lj_expand_sphere\|AtomicPairStyle:meam_ms\|AtomicPairStyle:pedone\|DihedralStyle:cosine_squared_restricted\|BondStyle:harmonic_restrain\|FFT3D\)'
%endif
%ifarch s390x
-%global testargs --label-exclude unstable --exclude-regex '\(SimpleCommands\|Variables\|ComputeGlobal\|MolPairStyle:coul_slater_long\|AtomicPairStyle:meam_spline\|FixTimestep:.*\|.*tip4p.*\|LibraryMPI\|MPILoadBalancing\|FileOperations\|Groups\|SetProperty\|AtomicPairStyle:lj_cut_sphere\|AtomicPairStyle:lj_expand_sphere\|AtomicPairStyle:meam_ms\|AtomicPairStyle:pedone\|DihedralStyle:cosine_squared_restricted\|BondStyle:harmonic_restrain\|TestPairList\|FFT3D\)'
+%global testargs --label-exclude unstable --exclude-regex '\(Random\|SimpleCommands\|Variables\|ComputeGlobal\|MolPairStyle:e3b\|MolPairStyle:coul_slater_long\|AtomicPairStyle:meam_spline\|FixTimestep:.*\|.*tip4p.*\|LibraryMPI\|MPILoadBalancing\|FileOperations\|Groups\|SetProperty\|AtomicPairStyle:lj_cut_sphere\|AtomicPairStyle:lj_expand_sphere\|AtomicPairStyle:meam_ms\|AtomicPairStyle:pedone\|DihedralStyle:cosine_squared_restricted\|BondStyle:harmonic_restrain\|TestPairList\|FFT3D\)'
%endif
set +e
@@ -380,6 +378,13 @@ done
%config %{_sysconfdir}/profile.d/lammps.*
%changelog
+* Sat Jul 25 2026 Richard Berger <richard.berger@outlook.com> - 20260704-1
+- Version bump to 20260704
+- Bump Kokkos requirement to 5.1
+- Remove patches that have been upstreamed
+- Disable Random test due to failures with OpenMPI
+- Disable MolPairStyle:e3b test due to aarch64 failures
+
* Sat Apr 18 2026 Richard Berger <richard.berger@outlook.com> - 20260330-1
- Version bump to 20260330
- Add patches to avoid unit test failures
diff --git a/sources b/sources
index 8bd0d62..4601a17 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,4 @@ SHA512 (googletest-1.17.0.tar.gz) = 0f57e9ef06925e5b7722df1eb92ef5850e8dce79220e
SHA512 (yaml-0.2.5.tar.gz) = dadd7d8e0d88b5ebab005e5d521d56d541580198aa497370966b98c904586e642a1cd4f3881094eb57624f218d50db77417bbfd0ffdce50340f011e35e8c4c02
SHA512 (opencl-loader-2024.05.09.tar.gz) = acf121e2dee04aa854b8816b50f4949c2fba3adefd43f4a89660ace8d061ff8c8a9dcdd8529d31b0b0be2fe22aef3678fdd2c54bdd7f8c5c529e45ed2bc3f70b
SHA512 (spglib-1.11.2.1.tar.gz) = 3be47cfb2faeeb680291a99389d780f08dd7bdc69c7a13b5199e4730dc6ffd72d153b596598fe5f732dcaaeb399745d4ddee445d9aab7a5aceda547552bf5f3e
-SHA512 (lammps-patch_30Mar2026.tar.gz) = 6d4774c8baae2a95f25376e26f13acf1bac638f72595caa2417c6c872ed6f56554eff007ebadd981a2662bec25909fb4e8efaaa0e2ec7a57e3c79a26052d264d
+SHA512 (lammps-patch_4Jul2026.tar.gz) = a8b67860b15f2f1e8754e7a700fe2e4768aec8ef51a91c915b3570aa37064001105fdd8e8f9313c67acfef46a7c06cc132ef427be9864ceae702b803649c3f75
diff --git a/unittest_fix.patch b/unittest_fix.patch
deleted file mode 100644
index 3ac9b5e..0000000
--- a/unittest_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9aa7470f1e8e1e55f208b40c15d9286a9f8b9ed6 Mon Sep 17 00:00:00 2001
-From: Axel Kohlmeyer <akohlmey@gmail.com>
-Date: Fri, 17 Apr 2026 11:43:59 -0400
-Subject: [PATCH] make test for format string error generic so it works for all
- format implementations
-
----
- unittest/formats/test_file_operations.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/unittest/formats/test_file_operations.cpp b/unittest/formats/test_file_operations.cpp
-index 2319cfc4d83c4b801c08545a4f2b4de65752ae31..b89efd4099df2a75ef8a833dab7460ccf24d1494 100644
---- a/unittest/formats/test_file_operations.cpp
-+++ b/unittest/formats/test_file_operations.cpp
-@@ -291,7 +291,9 @@ TEST_F(FileOperationsTest, error_all_one)
- TEST_FAILURE(".*ERROR: exit \\(testme.cpp:10\\).*", lmp->error->all("testme.cpp", 10, "exit"););
- TEST_FAILURE(".*ERROR: exit too \\(testme.cpp:10\\).*",
- lmp->error->all("testme.cpp", 10, "exit {}", "too"););
-- TEST_FAILURE(".*ERROR: argument not found \\(testme.cpp:10\\).*",
-+ // NOTE: we can only make a very generic check for an error, since the actual error
-+ // message depends on whether we use fmt::format() or std::format() and which compiler we use
-+ TEST_FAILURE(".*ERROR:.*\\(testme.cpp:10\\).*",
- lmp->error->all("testme.cpp", 10, "exit {} {}", "too"););
- TEST_FAILURE(".*ERROR on proc 0: exit \\(testme.cpp:10\\).*",
- lmp->error->one("testme.cpp", 10, "exit"););
diff --git a/unittest_fix2.patch b/unittest_fix2.patch
deleted file mode 100644
index 5eb0d18..0000000
--- a/unittest_fix2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 53dc6b204beb245edef42c8361d7d741990fae88 Mon Sep 17 00:00:00 2001
-From: Richard Berger <richard.berger@outlook.com>
-Date: Fri, 17 Apr 2026 21:19:12 -0600
-Subject: [PATCH] make one more check more generic in test_file_operations.cpp
-
----
- unittest/formats/test_file_operations.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unittest/formats/test_file_operations.cpp b/unittest/formats/test_file_operations.cpp
-index b89efd4099df2a75ef8a833dab7460ccf24d1494..4aa7da884b57987eb66ea09ee519789679a809cb 100644
---- a/unittest/formats/test_file_operations.cpp
-+++ b/unittest/formats/test_file_operations.cpp
-@@ -299,7 +299,7 @@ TEST_F(FileOperationsTest, error_all_one)
- lmp->error->one("testme.cpp", 10, "exit"););
- TEST_FAILURE(".*ERROR on proc 0: exit too \\(testme.cpp:10\\).*",
- lmp->error->one("testme.cpp", 10, "exit {}", "too"););
-- TEST_FAILURE(".*ERROR on proc 0: argument not found \\(testme.cpp:10\\).*",
-+ TEST_FAILURE(".*ERROR on proc 0:.*\\(testme.cpp:10\\).*",
- lmp->error->one("testme.cpp", 10, "exit {} {}", "too"););
- }
-
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-07-28 2:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-28 2:09 [rpms/lammps] f44: Version bump to 20260704 Richard Berger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox