public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/hipfort] rawhide: Update to 7.14
@ 2026-08-21  0:38 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-08-21  0:38 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/hipfort
            Branch : rawhide
            Commit : b5726ba8618ffb50308c2ead170e5ea7c3fdaecb
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-08-20T17:38:07-07:00
            Stats  : +48/-21 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/hipfort/c/b5726ba8618ffb50308c2ead170e5ea7c3fdaecb?branch=rawhide

            Log:
            Update to 7.14

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/.gitignore b/.gitignore
index b75e647..3e824a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /hipfort-7.0.1.tar.gz
 /hipfort-7.1.0.tar.gz
 /hipfort-7.2.0.tar.gz
+/hipfort-7.14.0.tar.gz

diff --git a/0001-Handle-cmake-BUILD_SHARED_LIBS-ON.patch b/0001-Handle-cmake-BUILD_SHARED_LIBS-ON.patch
new file mode 100644
index 0000000..646f44f
--- /dev/null
+++ b/0001-Handle-cmake-BUILD_SHARED_LIBS-ON.patch
@@ -0,0 +1,35 @@
+From 263ae181eb1fdd95acee0b47a4836d3afa032d0a Mon Sep 17 00:00:00 2001
+From: Tom Rix <Tom.Rix@amd.com>
+Date: Thu, 20 Aug 2026 16:52:46 -0700
+Subject: [PATCH] Handle cmake BUILD_SHARED_LIBS ON
+
+---
+ lib/CMakeLists.txt | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index e7fb7db109e2..4089da30079d 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -39,13 +39,16 @@ set(HIPFORT_ARCH "amdgcn")
+     # amdgcn
+     set(HIPFORT_LIB      "hipfort-${HIPFORT_ARCH}")
+     set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/include/hipfort/${HIPFORT_ARCH})
+-    ADD_LIBRARY(${HIPFORT_LIB} STATIC 
++    ADD_LIBRARY(${HIPFORT_LIB} SHARED 
+         ${HIPFORT_SRC_HIP} 
+         )
+     target_include_directories(${HIPFORT_LIB}
+       PUBLIC
+         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/hipfort/amdgcn>
+-    )
++      )
++    target_link_libraries(${HIPFORT_LIB} -lhipblas -lhipsparse -lhipsolver -lhipfft -lhiprand)
++    set_target_properties(${HIPFORT_LIB} PROPERTIES VERSION ${hipfort_VERSION} SOVERSION ${hipfort_VERSION})
++
+     IF(HIPFORT_USE_FPOINTER_INTERFACES)
+     	target_compile_definitions(${HIPFORT_LIB} PRIVATE USE_FPOINTER_INTERFACES)
+     ENDIF(HIPFORT_USE_FPOINTER_INTERFACES)
+-- 
+2.55.0
+

diff --git a/hipfort.spec b/hipfort.spec
index a93adb4..7e677ef 100644
--- a/hipfort.spec
+++ b/hipfort.spec
@@ -20,7 +20,7 @@
 # THE SOFTWARE.
 #
 %global upstreamname hipfort
-%global rocm_release 7.2
+%global rocm_release 7.14
 %global rocm_patch 0
 %global rocm_version %{rocm_release}.%{rocm_patch}
 
@@ -52,20 +52,14 @@
 
 Name:           hipfort%{pkg_suffix}
 Version:        %{rocm_version}
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        Fortran interfaces for ROCm libraries
 
 Url:            https://github.com/ROCm/%{upstreamname}
 License:        MIT
 Source0:        %{url}/archive/rocm-%{rocm_version}.tar.gz#/%{upstreamname}-%{rocm_version}.tar.gz
 # Build shared library instead of static, and set version/linking properties
-Patch0:         0001-Handle-cmake-DBUILD_SHARED_LIBS-ON.patch
-# Generalize hipfc script for other Linux distros with fallback paths
-Patch1:         0001-Generalize-hipfc-to-other-linux-distros.patch
-# https://github.com/ROCm/hipfort/issues/261
-Patch2:         0001-hipfort-remove-build-type-check.patch
-# https://github.com/ROCm/hipfort/issues/279
-Patch3:         0001-hipfort-remove-rocblas_sgemm_kernel_name.patch
+Patch0:         0001-Handle-cmake-BUILD_SHARED_LIBS-ON.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -102,12 +96,9 @@ The headers of libraries for %{name}.
 %prep
 %autosetup -p1 -n %{upstreamname}-rocm-%{version}
 
-# Can not pass -L*, hipfc gets confused and treats '-' as the start of a passthrough arg 
-sed -i -e 's|-o $@|-lrocfft -lrocrand -lrocblas -lrocsolver -lrocsparse -lhipfft -lhiprand -lhipblas -lhipsolver -lhipsparse -o $@|' test/Makefile.in
-
-# For CMake 4
-sed -i 's@cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR@cmake_minimum_required(VERSION 3.5@' bin/CMakeLists.txt
-
+# Remove some tests that do not build
+sed -i '/hipfort_add_test(hip stream f2003)/d' test/CMakeLists.txt
+sed -i '/hipfort_add_test(hip graph f2003)/d' test/CMakeLists.txt
 
 %build
 
@@ -130,7 +121,7 @@ sed -i 's@cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR@cmake_minimum_requir
 %if %{with check}
 %check
 export LD_LIBRARY_PATH=${PWD}/%{_vpath_builddir}/lib:$LD_LIBRARY_PATH
-%ctest -j1
+%ctest -j1 --output-on-failure
 %endif
 
 %install
@@ -148,17 +139,17 @@ rm -f %{buildroot}%{pkg_prefix}/share/doc/hipfort/LICENSE
 %files
 %license LICENSE
 %doc README.md
-%{pkg_prefix}/bin/hipfc
 %{pkg_prefix}/%{pkg_libdir}/libhipfort-amdgcn.so.*
-%{pkg_prefix}/libexec/hipfort
 
 %files devel
-%{pkg_prefix}/share/hipfort/
-%{pkg_prefix}/include/hipfort/
+%{pkg_prefix}/include/fortran/f95/hipfort/
 %{pkg_prefix}/%{pkg_libdir}/libhipfort-amdgcn.so
 %{pkg_prefix}/%{pkg_libdir}/cmake/hipfort/
 
 %changelog
+* Thu Aug 20 2026 Tom Rix <Tom.Rix@amd.com> - 7.14.0-1
+- Update to 7.14.0
+
 * Sat Aug 15 2026 Tom Rix <Tom.Rix@amd.com> - 7.2.0-6
 - Rebuild for 7.14
 

diff --git a/sources b/sources
index f4b3b54..30552e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hipfort-7.2.0.tar.gz) = cfac12d5165bba4c723262d7322be19644609bf1f139c423b8c9caf864c934de20fc537d4fcd939fdaeb5fe1f1ef7085615872caf65a186bddf5bb9b3da1737d
+SHA512 (hipfort-7.14.0.tar.gz) = 9b8f9be80c09f8f396ed932ae79c9a13e1f26c4256bbf6c56d491aee592d7b14ea8665b85e9f8265d05d876d8d7c394dc28e38027c1f45c2644b804276aa95d2

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-21  0:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-21  0:38 [rpms/hipfort] rawhide: Update to 7.14 Tom Rix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox