diff --git a/math/clad/Makefile b/math/clad/Makefile index c42ad7901ffc..c41bfd0634f8 100644 --- a/math/clad/Makefile +++ b/math/clad/Makefile @@ -1,38 +1,40 @@ PORTNAME= clad DISTVERSIONPREFIX= v -DISTVERSION= 1.3 +DISTVERSION= 1.4 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Automatic differentiation for C/C++ WWW= https://github.com/vgvassilev/clad LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/License.txt TEST_DEPENDS= kokkos>0:devel/kokkos -USES= cmake:testing compiler:c++14-lang llvm:15,build,run +USES= cmake:testing llvm:16,build,run localbase USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= vgvassilev CMAKE_ARGS= -DClang_DIR=${LLVM_PREFIX}/lib/cmake/clang \ -DLLVM_DIR=${LLVM_PREFIX}/lib/cmake/llvm \ -DLLVM_EXTERNAL_LIT=${LLVM_PREFIX}/bin/llvm-lit CMAKE_ON= BUILD_SHARED_LIBS CMAKE_TESTING_ON= FREEBSD_BUILD_TESTS FREEBSD_BUILD_DEMOS CMAKE_TESTING_TARGET= check-clad +#CXXFLAGS+= -D_OPENMP + post-patch: @${REINPLACE_CMD} \ -e ' \ s|import lit|&${LLVM_VERSION}|; \ s|lit\.|lit${LLVM_VERSION}.| \ ' \ ${WRKSRC}/test/lit.cfg -# tests fail to compile: https://github.com/vgvassilev/clad/issues/753 +# tests fail to compile: https://github.com/vgvassilev/clad/issues/798 .include diff --git a/math/clad/distinfo b/math/clad/distinfo index feb48912508f..f392eca1a1cf 100644 --- a/math/clad/distinfo +++ b/math/clad/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707720216 -SHA256 (vgvassilev-clad-v1.3_GH0.tar.gz) = 8a2dddef4339639e0e9cbe9ec89a0a2c57e98380e8c1072475d7f1a3551fba3a -SIZE (vgvassilev-clad-v1.3_GH0.tar.gz) = 961786 +TIMESTAMP = 1709605257 +SHA256 (vgvassilev-clad-v1.4_GH0.tar.gz) = da5584159499b05d77cfca40baee5d4d212beb269637736fee34d84d2b82d419 +SIZE (vgvassilev-clad-v1.4_GH0.tar.gz) = 969136 diff --git a/math/clad/files/patch-CMakeLists.txt b/math/clad/files/patch-CMakeLists.txt index de5157e27767..609c98a7523d 100644 --- a/math/clad/files/patch-CMakeLists.txt +++ b/math/clad/files/patch-CMakeLists.txt @@ -1,17 +1,17 @@ ---- CMakeLists.txt.orig 2024-02-11 18:10:50 UTC +--- CMakeLists.txt.orig 2024-02-29 15:28:44 UTC +++ CMakeLists.txt -@@ -313,10 +313,14 @@ if (NOT CLAD_BUILD_STATIC_ONLY) - # Filter some unsupported flags by clang. +@@ -309,10 +309,14 @@ if (NOT CLAD_BUILD_STATIC_ONLY) string(REPLACE "-fno-lifetime-dse" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE "-Wno-class-memaccess" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + if (FREEBSD_BUILD_TESTS) add_subdirectory(unittests) add_subdirectory(test) + endif() + if (FREEBSD_BUILD_DEMOS) add_subdirectory(demos/ErrorEstimation/CustomModel) add_subdirectory(demos/ErrorEstimation/PrintModel) + endif() # Add benchmarking infrastructure. if (CLAD_ENABLE_BENCHMARKS) diff --git a/math/clad/files/patch-cmake_modules_AddClad.cmake b/math/clad/files/patch-cmake_modules_AddClad.cmake index 6d24b30a687d..ad0c2f242b40 100644 --- a/math/clad/files/patch-cmake_modules_AddClad.cmake +++ b/math/clad/files/patch-cmake_modules_AddClad.cmake @@ -1,24 +1,25 @@ ---- cmake/modules/AddClad.cmake.orig 2024-02-12 07:51:28 UTC +--- cmake/modules/AddClad.cmake.orig 2024-02-29 15:28:44 UTC +++ cmake/modules/AddClad.cmake -@@ -1,14 +1,14 @@ - # Find the current branch. --execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- COMMAND git rev-parse HEAD -- OUTPUT_VARIABLE CURRENT_REPO_COMMIT -- OUTPUT_STRIP_TRAILING_WHITESPACE) --string(REPLACE "/" "" CURRENT_REPO_COMMIT ${CURRENT_REPO_COMMIT}) -+#execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -+# COMMAND git rev-parse HEAD -+# OUTPUT_VARIABLE CURRENT_REPO_COMMIT -+# OUTPUT_STRIP_TRAILING_WHITESPACE) -+#string(REPLACE "/" "" CURRENT_REPO_COMMIT ${CURRENT_REPO_COMMIT}) +@@ -1,15 +1,15 @@ if (CLAD_ENABLE_BENCHMARKS) + if (CLAD_ENABLE_BENCHMARKS) + # Find the current branch. +- execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- COMMAND git rev-parse HEAD +- OUTPUT_VARIABLE CURRENT_REPO_COMMIT +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- string(REPLACE "/" "" CURRENT_REPO_COMMIT ${CURRENT_REPO_COMMIT}) ++ #execute_process(WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ++ # COMMAND git rev-parse HEAD ++ # OUTPUT_VARIABLE CURRENT_REPO_COMMIT ++ # OUTPUT_STRIP_TRAILING_WHITESPACE) ++ #string(REPLACE "/" "" CURRENT_REPO_COMMIT ${CURRENT_REPO_COMMIT}) # Ask cmake to reconfigure each time we change the branch so that it can change # the value of CURRENT_REPO_COMMIT. -set_property(DIRECTORY APPEND PROPERTY - CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/.git/HEAD") +#set_property(DIRECTORY APPEND PROPERTY +# CMAKE_CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/.git/HEAD") - #------------------------------------------------------------------------------- - # function ENABLE_CLAD_FOR_EXECUTABLE( + endif(CLAD_ENABLE_BENCHMARKS) + diff --git a/math/clad/pkg-plist b/math/clad/pkg-plist index bdbe0e3a8b2f..625e53524eda 100644 --- a/math/clad/pkg-plist +++ b/math/clad/pkg-plist @@ -1,41 +1,37 @@ include/clad/Differentiator/Array.h include/clad/Differentiator/ArrayExpression.h include/clad/Differentiator/ArrayRef.h include/clad/Differentiator/BaseForwardModeVisitor.h include/clad/Differentiator/BuiltinDerivatives.h include/clad/Differentiator/CladConfig.h include/clad/Differentiator/CladUtils.h include/clad/Differentiator/Compatibility.h include/clad/Differentiator/DerivativeBuilder.h include/clad/Differentiator/DiffMode.h include/clad/Differentiator/DiffPlanner.h include/clad/Differentiator/Differentiator.h include/clad/Differentiator/ErrorEstimator.h include/clad/Differentiator/EstimationModel.h include/clad/Differentiator/ExternalRMVSource.h include/clad/Differentiator/FunctionTraits.h include/clad/Differentiator/HessianModeVisitor.h include/clad/Differentiator/JacobianModeVisitor.h include/clad/Differentiator/Matrix.h include/clad/Differentiator/MultiplexExternalRMVSource.h include/clad/Differentiator/NumericalDiff.h include/clad/Differentiator/ParseDiffArgsTypes.h include/clad/Differentiator/PushForwardModeVisitor.h include/clad/Differentiator/ReverseModeForwPassVisitor.h include/clad/Differentiator/ReverseModeVisitor.h include/clad/Differentiator/ReverseModeVisitorDirectionKinds.h include/clad/Differentiator/STLBuiltins.h include/clad/Differentiator/StmtClone.h include/clad/Differentiator/Tape.h include/clad/Differentiator/VectorForwardModeVisitor.h include/clad/Differentiator/VectorPushForwardModeVisitor.h include/clad/Differentiator/Version.h include/clad/Differentiator/VisitorBase.h include/clad/tools/ClangBackendPlugin.h include/clad/tools/ClangPlugin.h include/clad/tools/DerivedFnInfo.h lib/clad.so -lib/libcladDifferentiator.so -lib/libcladDifferentiator.so.15 -lib/libcladPlugin.so -lib/libcladPlugin.so.15