rpm/python3-espressomd
SHA256
1
0
Fork 0
forked from pool/python3-espressomd
Code Pull Requests Activity

Accepting request 990646 from devel:languages:python:numeric

Browse Source 
revert

OBS-URL: https://build.opensuse.org/request/show/990646
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python3-espressomd?expand=0&rev=39
This commit is contained in:
Matej Cepl 2022-07-22 08:24:49 +00:00 committed by Git OBS Bridge
parent 087149a635
commit 0b84913286
3 changed files with 1 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
4538-32bit-compatible.patch
View File

@ -1,56 +0,0 @@
From 8182bb208e31cf9244dd3e6f567d3e27a33c973e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= <jgrad@icp.uni-stuttgart.de>
Date: Wed, 20 Jul 2022 21:25:34 +0200
Subject: [PATCH 1/2] tests: Fix integral size on 32bit archs
---
src/scafacos/src/Scafacos.cpp | 13 -------------
src/utils/tests/integral_parameter_test.cpp | 6 +++---
2 files changed, 3 insertions(+), 16 deletions(-)
--- a/src/scafacos/src/Scafacos.cpp
+++ b/src/scafacos/src/Scafacos.cpp
@@ -21,7 +21,6 @@
#include "utils.hpp"
-#include <algorithm>
#include <string>
#include <utility>
#include <vector>
@@ -71,18 +70,6 @@ std::vector<std::string> Scafacos::avail
return methods;
}
-static std::string parse_method_parameters(
- std::vector<std::vector<std::string>> const &parameters) {
- std::string method_params = "";
- for (auto const &parameter : parameters) {
- for (auto const &value : parameter) {
- method_params += " " + value;
- }
- }
- std::replace(method_params.begin(), method_params.end(), ' ', ',');
- return method_params.substr(1);
-}
-
Scafacos::Scafacos(MPI_Comm comm, std::string method, std::string parameters)
: m_method_name{std::move(method)}, m_parameters{std::move(parameters)} {
--- a/src/utils/tests/integral_parameter_test.cpp
+++ b/src/utils/tests/integral_parameter_test.cpp
@@ -38,11 +38,11 @@ BOOST_AUTO_TEST_CASE(integral_parameter_
std::pair<std::size_t, int>>::value,
"");
- BOOST_CHECK(std::make_pair(1ul, 13) ==
+ BOOST_CHECK(std::make_pair(std::size_t{1u}, 13) ==
(Utils::integral_parameter<F, 1, 5>(1, 13)));
- BOOST_CHECK(std::make_pair(3ul, 13) ==
+ BOOST_CHECK(std::make_pair(std::size_t{3u}, 13) ==
(Utils::integral_parameter<F, 1, 5>(3, 13)));
- BOOST_CHECK(std::make_pair(5ul, 13) ==
+ BOOST_CHECK(std::make_pair(std::size_t{5u}, 13) ==
(Utils::integral_parameter<F, 1, 5>(5, 13)));
BOOST_CHECK_THROW((Utils::integral_parameter<F, 1, 5>(6, 13)),
std::exception);

5
python3-espressomd.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Thu Jul 21 10:36:18 UTC 2022 - Matej Cepl <mcepl@suse.com>
- Add 4538-32bit-compatible.patch to make 32bit build.
-------------------------------------------------------------------
Tue Jul 19 19:40:59 UTC 2022 - Matej Cepl <mcepl@suse.com>

5
python3-espressomd.spec
View File

@ -51,10 +51,7 @@ Patch2: hdf5.patch
# PATCH-FIX-OPENSUSE rpath.patch boo#1198352
Patch3: rpath.patch
# According to gh#espressomd/espresso#4537 32bit architectures are not supported any more
# PATCH-FIX-UPSTREAM 4538-32bit-compatible.patch gh#espressomd/espresso#4537 mcepl@suse.com
# This should help
Patch4: 4538-32bit-compatible.patch
# ExcludeArch: %{ix86}
ExcludeArch: %{ix86}
BuildRequires: cmake
BuildRequires: fftw3-devel
BuildRequires: gcc-c++