From 806cc93954f11a4cf572f7cfec9c1dac5f08bd9e Mon Sep 17 00:00:00 2001
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Wed, 8 Nov 2023 15:29:30 -0800
Subject: [PATCH] =?UTF-8?q?math/hydrogen:=20update=201.5.2=20=E2=86=92=201?=
 =?UTF-8?q?.5.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported by:	portscout
---
 math/hydrogen/Makefile                        | 23 ++++++++++---------
 math/hydrogen/distinfo                        |  6 ++---
 .../patch-tests_blas__like_Gemm__Suite.cpp    | 19 +++++++++++++++
 math/hydrogen/pkg-plist                       |  2 +-
 misc/lbann/Makefile                           |  2 +-
 5 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 math/hydrogen/files/patch-tests_blas__like_Gemm__Suite.cpp

diff --git a/math/hydrogen/Makefile b/math/hydrogen/Makefile
index e487f64acb170..aee1626de4153 100644
--- a/math/hydrogen/Makefile
+++ b/math/hydrogen/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	hydrogen
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.2
+DISTVERSION=	1.5.3
 CATEGORIES=	math
 PKGNAMESUFFIX=	-linear-algebra
 
@@ -10,31 +10,32 @@ WWW=		https://github.com/LLNL/Elemental
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	cereal>0:devel/cereal
+BUILD_DEPENDS=	cereal>0:devel/cereal \
+		half>0:math/half
 LIB_DEPENDS=	libopenblas.so:math/openblas
+RUN_DEPENDS=	half>0:math/half
 
-USES=		cmake:testing compiler:c++17-lang
+USES=		cmake:testing compiler:c++17-lang localbase:ldflags
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 GH_PROJECT=	Elemental
 
-CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		Hydrogen_ENABLE_HALF \
+		Hydrogen_ENABLE_MPC \
+		Hydrogen_ENABLE_QD
+		#Hydrogen_ENABLE_ALUMINUM # depends on OpenMPI - so we disable it for now
 CMAKE_OFF=	Hydrogen_ENABLE_TESTING
-CMAKE_TESTING_ON=	Hydrogen_ENABLE_TESTING # not clear how to run tests, see https://github.com/LLNL/Elemental/issues/156
-CMAKE_TESTING_TARGET=
+CMAKE_TESTING_ON=	Hydrogen_ENABLE_TESTING
+CMAKE_TESTING_TARGET=	test
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
-OPTIONS_DEFINE=		MPC
 OPTIONS_DEFAULT=	MPICH # should be same as in misc/lbann
 
 MPICH_USES=		mpi:mpich
 
-MPC_DESC=		Use MPC(+MPFR+GMP) library and enable related features
-MPC_CMAKE_BOOL=		Hydrogen_ENABLE_MPC
-MPC_BROKEN=		fails to enable: Disabling MPFR since MPI_LONG_LONG was not detected
-
 OPENMPI_USES=		mpi:openmpi
 
 BINARY_ALIAS=	git=false
diff --git a/math/hydrogen/distinfo b/math/hydrogen/distinfo
index 0a63ae6915be0..dc72e8cefdf0d 100644
--- a/math/hydrogen/distinfo
+++ b/math/hydrogen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692336550
-SHA256 (LLNL-Elemental-v1.5.2_GH0.tar.gz) = a902cad3962471216cfa278ba0561c18751d415cd4d6b2417c02a43b0ab2ea33
-SIZE (LLNL-Elemental-v1.5.2_GH0.tar.gz) = 2754510
+TIMESTAMP = 1699418840
+SHA256 (LLNL-Elemental-v1.5.3_GH0.tar.gz) = faefbe738bd364d0e26ce9ad079a11c93a18c6f075719a365fd4fa5f1f7a989a
+SIZE (LLNL-Elemental-v1.5.3_GH0.tar.gz) = 2756471
diff --git a/math/hydrogen/files/patch-tests_blas__like_Gemm__Suite.cpp b/math/hydrogen/files/patch-tests_blas__like_Gemm__Suite.cpp
new file mode 100644
index 0000000000000..24796a711eee1
--- /dev/null
+++ b/math/hydrogen/files/patch-tests_blas__like_Gemm__Suite.cpp
@@ -0,0 +1,19 @@
+--- tests/blas_like/Gemm_Suite.cpp.orig	2023-11-08 23:05:42 UTC
++++ tests/blas_like/Gemm_Suite.cpp
+@@ -555,11 +555,11 @@ struct HalfTypeT<Device::GPU>
+     using type = gpu_half_type;
+ };
+ #else
+-template <>
+-struct HalfTypeT<Device::GPU>
+-{
+-    using type = UndefinedType;
+-};
++//template <>
++//struct HalfTypeT<Device::GPU>
++//{
++//    using type = UndefinedType;
++//};
+ #endif // HYDROGEN_HAVE_GPU
+ #endif // HYDROGEN_HAVE_HALF
+ 
diff --git a/math/hydrogen/pkg-plist b/math/hydrogen/pkg-plist
index 80a0a6e1f905e..34162d70120c9 100644
--- a/math/hydrogen/pkg-plist
+++ b/math/hydrogen/pkg-plist
@@ -345,4 +345,4 @@ lib/cmake/hydrogen/modules/HydrogenCleanupHIPTargets.cmake
 lib/cmake/hydrogen/modules/HydrogenETIGeneration.cmake
 lib/cmake/hydrogen/modules/PrintHydrogenSummary.cmake
 lib/libHydrogen_CXX.so
-lib/libHydrogen_CXX.so.1.5.2
+lib/libHydrogen_CXX.so.1.5.3
diff --git a/misc/lbann/Makefile b/misc/lbann/Makefile
index c7369a916546d..7ad120d7f7b16 100644
--- a/misc/lbann/Makefile
+++ b/misc/lbann/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	lbann
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.102-254
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-g2e3012a9a
 CATEGORIES=	misc # machine-learning