Try again with less broken capping patches...
This commit is contained in:
parent
d678a6a69f
commit
a0095d14ee
@ -1,5 +1,5 @@
|
||||
From 3ba0136000c986c692baab7b112aba163173d2d3 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <3ba0136000c986c692baab7b112aba163173d2d3.1566556488.git.pmatilai@redhat.com>
|
||||
From 4d16d81a1af3e43b8392e7c335f616c9c0c6e41b Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <4d16d81a1af3e43b8392e7c335f616c9c0c6e41b.1566558648.git.pmatilai@redhat.com>
|
||||
From: Panu Matilainen <pmatilai@redhat.com>
|
||||
Date: Fri, 23 Aug 2019 11:09:40 +0300
|
||||
Subject: [PATCH 1/2] Fix build code thread cap logic for unlimited CPUs
|
||||
@ -12,7 +12,7 @@ limiting to 1.
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/build/parseSpec.c b/build/parseSpec.c
|
||||
index 055bdf012..61858aabd 100644
|
||||
index 055bdf012..737a1233c 100644
|
||||
--- a/build/parseSpec.c
|
||||
+++ b/build/parseSpec.c
|
||||
@@ -1036,9 +1036,8 @@ static rpmSpec parseSpec(const char *specFile, rpmSpecFlags flags,
|
||||
@ -22,7 +22,7 @@ index 055bdf012..61858aabd 100644
|
||||
- if (ncpus <= 0)
|
||||
- ncpus = 1;
|
||||
- omp_set_num_threads(ncpus);
|
||||
+ if (ncpus > 0) {
|
||||
+ if (ncpus > 0)
|
||||
+ omp_set_num_threads(ncpus);
|
||||
#endif
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
From bcaa30872087a1002648653358ab9514f829de9a Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <bcaa30872087a1002648653358ab9514f829de9a.1566556488.git.pmatilai@redhat.com>
|
||||
In-Reply-To: <3ba0136000c986c692baab7b112aba163173d2d3.1566556488.git.pmatilai@redhat.com>
|
||||
References: <3ba0136000c986c692baab7b112aba163173d2d3.1566556488.git.pmatilai@redhat.com>
|
||||
From 4c772fcf7114d6ce20800c12bc377b490d267548 Mon Sep 17 00:00:00 2001
|
||||
Message-Id: <4c772fcf7114d6ce20800c12bc377b490d267548.1566558648.git.pmatilai@redhat.com>
|
||||
In-Reply-To: <4d16d81a1af3e43b8392e7c335f616c9c0c6e41b.1566558648.git.pmatilai@redhat.com>
|
||||
References: <4d16d81a1af3e43b8392e7c335f616c9c0c6e41b.1566558648.git.pmatilai@redhat.com>
|
||||
From: Panu Matilainen <pmatilai@redhat.com>
|
||||
Date: Fri, 23 Aug 2019 11:17:21 +0300
|
||||
Subject: [PATCH 2/2] Cap number of threads on 32bit platforms, add a tunable
|
||||
@ -21,10 +21,10 @@ number of threads just in case, defaulting to max CPUs available.
|
||||
2 files changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/parseSpec.c b/build/parseSpec.c
|
||||
index 61858aabd..d987bdc7b 100644
|
||||
index 737a1233c..ab3ba9cae 100644
|
||||
--- a/build/parseSpec.c
|
||||
+++ b/build/parseSpec.c
|
||||
@@ -1035,9 +1035,17 @@ static rpmSpec parseSpec(const char *specFile, rpmSpecFlags flags,
|
||||
@@ -1035,7 +1035,15 @@ static rpmSpec parseSpec(const char *specFile, rpmSpecFlags flags,
|
||||
|
||||
#ifdef ENABLE_OPENMP
|
||||
/* Set number of OMP threads centrally */
|
||||
@ -37,12 +37,10 @@ index 61858aabd..d987bdc7b 100644
|
||||
+ rpmlog(RPMLOG_DEBUG,
|
||||
+ "limiting number of threads to %d due to platform\n", ncpus);
|
||||
+ }
|
||||
if (ncpus > 0) {
|
||||
omp_set_num_threads(ncpus);
|
||||
+#endif
|
||||
if (ncpus > 0)
|
||||
omp_set_num_threads(ncpus);
|
||||
#endif
|
||||
|
||||
if (spec->clean == NULL) {
|
||||
diff --git a/platform.in b/platform.in
|
||||
index db6d2382f..c70f44193 100644
|
||||
--- a/platform.in
|
||||
|
Loading…
Reference in New Issue
Block a user