git: 0845e33fe1bb - main - science/{,py-}arbor: Update 0.8.1 → 0.9.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Fri, 11 Aug 2023 08:11:28 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0845e33fe1bb8e2fffaa278684e6b084ac021e52

commit 0845e33fe1bb8e2fffaa278684e6b084ac021e52
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-08-11 08:10:29 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-08-11 08:11:18 +0000

    science/{,py-}arbor: Update 0.8.1 → 0.9.0
    
    Reported by:    portscout
---
 science/arbor/Makefile                      |  6 ++++--
 science/arbor/distinfo                      |  6 +++---
 science/arbor/pkg-plist                     |  6 ++++++
 science/py-arbor/Makefile                   |  5 +++--
 science/py-arbor/distinfo                   |  6 +++---
 science/py-arbor/files/patch-CMakeLists.txt | 10 ++++++++--
 6 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/science/arbor/Makefile b/science/arbor/Makefile
index d4bb0259284a..cb774c521698 100644
--- a/science/arbor/Makefile
+++ b/science/arbor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	arbor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.1
+DISTVERSION=	0.9.0
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -17,7 +17,9 @@ BUILD_DEPENDS=	bash:shells/bash \
 		nlohmann-json>0:devel/nlohmann-json \
 		random123>0:devel/random123 \
 		${PYTHON_PKGNAMEPREFIX}svgwrite>0:graphics/py-svgwrite@${PY_FLAVOR}
-LIB_DEPENDS=	libpugixml.so:textproc/pugixml
+BUILD_DEPENDS+=	${LOCALBASE}/lib/cmake/GTest/GTestConfig.cmake:devel/googletest # https://github.com/arbor-sim/arbor/issues/2205
+LIB_DEPENDS=	libhwloc.so:devel/hwloc2 \
+		libpugixml.so:textproc/pugixml
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}svgwrite>0:graphics/py-svgwrite@${PY_FLAVOR}
 TEST_DEPENDS=	googletest>=0:devel/googletest
 
diff --git a/science/arbor/distinfo b/science/arbor/distinfo
index 2fd4d9cc91b9..467206167c80 100644
--- a/science/arbor/distinfo
+++ b/science/arbor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671842310
-SHA256 (arbor-sim-arbor-v0.8.1_GH0.tar.gz) = 9d32edf5def9bbe30b5648d064291b86cf3f637b2dc0b82f7a276f5f41e6bcef
-SIZE (arbor-sim-arbor-v0.8.1_GH0.tar.gz) = 7812575
+TIMESTAMP = 1691736150
+SHA256 (arbor-sim-arbor-v0.9.0_GH0.tar.gz) = 920c7926453379d367c6c8bb01ff867c03e44e8a7a6a5655d5eaa3d692618ca1
+SIZE (arbor-sim-arbor-v0.9.0_GH0.tar.gz) = 10164524
diff --git a/science/arbor/pkg-plist b/science/arbor/pkg-plist
index 88f635490f8f..4afab017bce6 100644
--- a/science/arbor/pkg-plist
+++ b/science/arbor/pkg-plist
@@ -12,6 +12,7 @@ include/arbor/cable_cell.hpp
 include/arbor/cable_cell_param.hpp
 include/arbor/common_types.hpp
 include/arbor/communication/mpi_error.hpp
+include/arbor/communication/remote.hpp
 include/arbor/constants.hpp
 include/arbor/context.hpp
 include/arbor/cv_policy.hpp
@@ -58,6 +59,7 @@ include/arbor/recipe.hpp
 include/arbor/s_expr.hpp
 include/arbor/sampling.hpp
 include/arbor/schedule.hpp
+include/arbor/serdes.hpp
 include/arbor/simd/approx.hpp
 include/arbor/simd/avx.hpp
 include/arbor/simd/avx512.hpp
@@ -68,6 +70,9 @@ include/arbor/simd/neon.hpp
 include/arbor/simd/simd.hpp
 include/arbor/simd/simd_io.hpp
 include/arbor/simd/sve.hpp
+include/arbor/simd/sve_bits.hpp
+include/arbor/simd/vls_sve.hpp
+include/arbor/simd/vls_sve_bits.hpp
 include/arbor/simple_sampler.hpp
 include/arbor/simulation.hpp
 include/arbor/spike.hpp
@@ -99,6 +104,7 @@ include/arborenv/with_mpi.hpp
 include/arborio/cableio.hpp
 include/arborio/cv_policy_parse.hpp
 include/arborio/export.hpp
+include/arborio/json_serdes.hpp
 include/arborio/label_parse.hpp
 include/arborio/neurolucida.hpp
 include/arborio/neuroml.hpp
diff --git a/science/py-arbor/Makefile b/science/py-arbor/Makefile
index 8bd2028e8784..b6e559395a89 100644
--- a/science/py-arbor/Makefile
+++ b/science/py-arbor/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	arbor
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.1
+DISTVERSION=	0.9.0
 CATEGORIES=	science
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -11,7 +11,8 @@ WWW=		https://arbor-sim.org/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-BUILD_DEPENDS=	pybind11>0:devel/pybind11
+BUILD_DEPENDS=	pybind11>0:devel/pybind11 \
+		nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libarbor.so:science/arbor
 
 USES=		cmake compiler:c++17-lang localbase:ldflags python
diff --git a/science/py-arbor/distinfo b/science/py-arbor/distinfo
index 4c6eb0df5332..249aad786e70 100644
--- a/science/py-arbor/distinfo
+++ b/science/py-arbor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671874647
-SHA256 (arbor-sim-arbor-v0.8.1_GH0.tar.gz) = 9d32edf5def9bbe30b5648d064291b86cf3f637b2dc0b82f7a276f5f41e6bcef
-SIZE (arbor-sim-arbor-v0.8.1_GH0.tar.gz) = 7812575
+TIMESTAMP = 1691740349
+SHA256 (arbor-sim-arbor-v0.9.0_GH0.tar.gz) = 920c7926453379d367c6c8bb01ff867c03e44e8a7a6a5655d5eaa3d692618ca1
+SIZE (arbor-sim-arbor-v0.9.0_GH0.tar.gz) = 10164524
diff --git a/science/py-arbor/files/patch-CMakeLists.txt b/science/py-arbor/files/patch-CMakeLists.txt
index 9441da10091c..988f55467741 100644
--- a/science/py-arbor/files/patch-CMakeLists.txt
+++ b/science/py-arbor/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2022-11-15 15:19:19 UTC
+--- CMakeLists.txt.orig	2023-08-10 09:47:38 UTC
 +++ CMakeLists.txt
 @@ -1,3 +1,7 @@
 +cmake_minimum_required(VERSION 3.19)
@@ -8,7 +8,7 @@
  include(GNUInstallDirs)
  
  set(PYBIND11_CPP_STANDARD -std=c++17)
-@@ -79,14 +83,14 @@ if (ARB_WITH_MPI)
+@@ -80,14 +84,14 @@ if (ARB_WITH_MPI)
  endif()
  
  # For unit tests on C++ side of Python wrappers
@@ -26,3 +26,9 @@
  
  # Set the installation path
  
+@@ -117,4 +121,4 @@ endif()
+ 
+ install(TARGETS pyarb DESTINATION ${_python_module_install_path})
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py DESTINATION ${_python_module_install_path})
+-install(FILES ${PROJECT_SOURCE_DIR}/VERSION ${PROJECT_SOURCE_DIR}/README.md ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${_python_module_install_path})
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../VERSION DESTINATION ${_python_module_install_path})