The package rpms/clblast.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/clblast.git/commit/?id=8cc20827b3....
Change:
-%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 8cc20827b32fd14439f228ae8f333912035ea522
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Sep 29 16:56:03 2022 -0600
Version 1.5.3.
- Drop upstreamed -reference patch.
- Run tests on all arches.
diff --git a/clblast-reference.patch b/clblast-reference.patch
deleted file mode 100644
index 7a41700..0000000
--- a/clblast-reference.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Addresses warnings like this:
-
-/builddir/build/BUILD/CLBlast-1.5.2/src/kernel_preprocessor.cpp:221:19: warning: loop
variable 'array_name_map' creates a copy from type 'const std::pair<const
std::__cxx11::basic_string<char>, long unsigned int>'
[-Wrange-loop-construct]
- 221 | for (const auto array_name_map : arrays_to_registers) { // only if marked to
be promoted
- | ^~~~~~~~~~~~~~
-/builddir/build/BUILD/CLBlast-1.5.2/src/kernel_preprocessor.cpp:221:19: note: use
reference type to prevent copying
- 221 | for (const auto array_name_map : arrays_to_registers) { // only if marked to
be promoted
- | ^~~~~~~~~~~~~~
- | &
-
---- src/kernel_preprocessor.cpp.orig 2021-01-19 13:19:12.000000000 -0700
-+++ src/kernel_preprocessor.cpp 2021-01-20 09:30:45.073444987 -0700
-@@ -218,7 +218,7 @@ void ArrayToRegister(std::string &source
- const std::unordered_map<std::string, size_t>&
arrays_to_registers,
- const size_t num_brackets) {
-
-- for (const auto array_name_map : arrays_to_registers) { // only if marked to be
promoted
-+ for (const auto& array_name_map : arrays_to_registers) { // only if marked to be
promoted
-
- // Outside of a function
- if (num_brackets == 0) {
---- src/tuning/tuning_api.cpp.orig 2021-01-19 13:19:12.000000000 -0700
-+++ src/tuning/tuning_api.cpp 2021-01-20 09:31:45.177314633 -0700
-@@ -374,7 +374,7 @@ StatusCode TunerAPI(Queue &queue, const
- if (best_time_ms == 0.0) { return StatusCode::kUnexpectedError; }
-
- // Stores the best parameters
-- for (const auto config : best_configuration->config) {
-+ for (const auto& config : best_configuration->config) {
- parameters[config.first] = config.second;
- }
- return StatusCode::kSuccess;
---- src/tuning/tuning.cpp.orig 2021-01-19 13:19:12.000000000 -0700
-+++ src/tuning/tuning.cpp 2021-01-20 09:50:18.952577039 -0700
-@@ -62,7 +62,7 @@ void PrintTimingsToFileAsJSON(const std:
- fprintf(file, " \"parameters\": {");
- auto num_configs = result.config.size();
- auto p = size_t{0};
-- for (const auto parameter : result.config) {
-+ for (const auto& parameter : result.config) {
- fprintf(file, "\"%s\": %zu", parameter.first.c_str(),
parameter.second);
- if (p < num_configs -1 ) { fprintf(file, ","); }
- ++p;
-@@ -336,7 +336,7 @@ void Tuner(int argc, char* argv[], const
- printf(" %6.1lf |", settings.metric_amount / (time_ms * 1.0e6));
- printf(" %sresults match%s |\n", kPrintSuccess.c_str(),
kPrintEnd.c_str());
- }
-- catch (CLCudaAPIBuildError) {
-+ catch (CLCudaAPIBuildError&) {
- const auto status_code = DispatchExceptionCatchAll(true);
- printf(" %scompilation error: %5d%s |",
- kPrintError.c_str(), static_cast<int>(status_code),
kPrintEnd.c_str());
-@@ -365,7 +365,7 @@ void Tuner(int argc, char* argv[], const
-
- // Computes and prints some other statistics
- auto average_ms = 0.0;
-- for (const auto result : results) { average_ms += result.score; }
-+ for (const auto& result : results) { average_ms += result.score; }
- average_ms /= results.size();
- printf("\n");
- printf("* Got average result of %.2lf ms", average_ms);
-@@ -380,7 +380,7 @@ void Tuner(int argc, char* argv[], const
- printf("* Best parameters: ");
- auto best_string = std::string{""};
- auto i = size_t{0};
-- for (const auto config : best_configuration->config) {
-+ for (const auto& config : best_configuration->config) {
- best_string += "" + config.first + "=" +
ToString(config.second);
- if (i < best_configuration->config.size() - 1) { best_string += " ";
}
- ++i;
---- test/test_utilities.cpp.orig 2021-01-19 13:19:12.000000000 -0700
-+++ test/test_utilities.cpp 2021-01-20 09:29:17.425562237 -0700
-@@ -131,7 +131,7 @@ void OverrideParametersFromJSONFiles(con
-
- // Retrieves the best parameters for each file from disk
- BestParametersCollection all_parameters;
-- for (const auto json_file_name : file_names) {
-+ for (const auto& json_file_name : file_names) {
- GetBestParametersFromJSONFile(json_file_name, all_parameters, precision);
- }
-
-@@ -199,7 +199,7 @@ void GetBestParametersFromJSONFile(const
-
- // Creates the list of parameters
- fprintf(stdout, "* Found parameters for kernel '%s': { ",
kernel_family.c_str());
-- for (const auto config : config_split) {
-+ for (const auto& config : config_split) {
- const auto params_split = split(config, '=');
- if (params_split.size() != 2) { break; }
- const auto parameter_name = params_split[0];
diff --git a/clblast.spec b/clblast.spec
index d068779..3b40b2f 100644
--- a/clblast.spec
+++ b/clblast.spec
@@ -1,18 +1,9 @@
# TESTING NOTE: An OpenCL device is needed to run the tests. Since the koji
# builders may or may not have a GPU, we use the CPU-only POCL implementation.
-# However:
-# - POCL is not available on ppc64le or s390x due to failing tests.
-# - Builds with POCL on 32-bit ARM fail with an undefined symbol error:
-# __gnu_f2h_ieee. This symbol is defined in libLLVM, but we are building
-# with gcc/g++, not clang. Since POCL is built with clang, this appears to
-# be a POCL or clang bug.
-# - Builds with POCL on aarch64 fail one DAXPY test, not yet diagnosed.
-# - Builds with POCL on i686 often fail due to memory exhaustion.
-# That leaves x86_64 as the only platform that can run the tests.
Name: clblast
-Version: 1.5.2
-Release: 5%{?dist}
+Version: 1.5.3
+Release: 1%{?dist}
Summary: Tuned OpenCL BLAS routines
License: Apache-2.0
@@ -20,21 +11,15 @@ URL:
https://cnugteren.github.io/clblast/clblast.html
Source0:
https://github.com/CNugteren/CLBlast/archive/%{version}/%{name}-%{version...
# Fix name clashes between macros in altivec.h and standard types on ppc64le
Patch0: %{name}-altivec.patch
-# Eliminate unnecessary copying with references
-#
https://github.com/CNugteren/CLBlast/pull/410
-Patch1: %{name}-reference.patch
BuildRequires: cmake
+BuildRequires: compiler-rt
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: ocl-icd-devel
BuildRequires: pkgconfig(flexiblas)
-%ifarch %{ix86} x86_64
BuildRequires: pocl-devel
-# Work around bz 1734850
-BuildRequires: compiler-rt
-%endif
%description
CLBlast is a modern, lightweight, performant and tunable OpenCL BLAS
@@ -95,13 +80,18 @@ sed -i 's,NAMES cblas blas,NAMES cblas blas flexiblas,'
cmake/Modules/FindCBLAS.
%doc doc
%{_includedir}/%{name}*.h
%{_libdir}/lib{%name}.so
-%{_libdir}/cmake/CLBLast/
+%{_libdir}/cmake/CLBlast/
%{_libdir}/pkgconfig/%{name}.pc
%files tuners
%{_bindir}/*
%changelog
+* Thu Sep 29 2022 Jerry James <loganjerry(a)gmail.com> - 1.5.3-1
+- Version 1.5.3
+- Drop upstreamed -reference patch
+- Run tests on all arches
+
* Mon Aug 15 2022 Jerry James <loganjerry(a)gmail.com> - 1.5.2-5
- Convert License field to SPDX
diff --git a/sources b/sources
index e11c2aa..9c85cac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clblast-1.5.2.tar.gz) =
6693704321bb7623a632ebfc71dcf07bbe4ba6c6f03a2ecf52bc10b401ae546bf82cdd3f6cc28aa9ea10f40dc7b2e86a6530f32cfbd522e24d4cf6a75c8c1100
+SHA512 (clblast-1.5.3.tar.gz) =
58cb3ca88cd7a3c52292d31f7b00a160b49f2131d925249e8b83e0fe3c538b509805e7a64e0d13521780024000be1ca6909f47735c2ede161674cb9894170458
commit 3704822a57a800596ee77920ab6f698662d4a3c2
Author: Jerry James <loganjerry(a)gmail.com>
Date: Mon Aug 15 14:40:35 2022 -0600
Convert License field to SPDX.
diff --git a/clblast.spec b/clblast.spec
index 6511f84..d068779 100644
--- a/clblast.spec
+++ b/clblast.spec
@@ -15,7 +15,7 @@ Version: 1.5.2
Release: 5%{?dist}
Summary: Tuned OpenCL BLAS routines
-License: ASL 2.0
+License: Apache-2.0
URL:
https://cnugteren.github.io/clblast/clblast.html
Source0:
https://github.com/CNugteren/CLBlast/archive/%{version}/%{name}-%{version...
# Fix name clashes between macros in altivec.h and standard types on ppc64le
@@ -102,6 +102,9 @@ sed -i 's,NAMES cblas blas,NAMES cblas blas flexiblas,'
cmake/Modules/FindCBLAS.
%{_bindir}/*
%changelog
+* Mon Aug 15 2022 Jerry James <loganjerry(a)gmail.com> - 1.5.2-5
+- Convert License field to SPDX
+
* Wed Jul 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.2-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild