diff --git a/math/dgl/Makefile b/math/dgl/Makefile index cf4718993603..0af68a613b99 100644 --- a/math/dgl/Makefile +++ b/math/dgl/Makefile @@ -1,67 +1,67 @@ PORTNAME= dgl -DISTVERSION= 1.1.1 +DISTVERSION= 1.1.2 CATEGORIES= math # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Deep Graph Library WWW= https://www.dgl.ai/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${BACKEND_DEPENDS} \ bash:shells/bash \ gmake:devel/gmake USES= cmake:testing compiler:c++17-lang localbase:ldflags python:build shebangfix USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= dmlc GH_TUPLE= apache:tvm:b2e418c:tvm/third_party/tvm \ dmlc:dlpack:e2bdd3b:dlpack/third_party/dlpack \ dmlc:dmlc-core:bfad207:dmlc_core/third_party/dmlc-core \ greg7mdp:parallel-hashmap:25293ce:phmap/third_party/phmap \ herumi:xbyak:757e406:xbyak/third_party/xbyak \ imneme:pcg-cpp:428802d:pcg/third_party/pcg \ jlblancoc:nanoflann:4c47ca2:nanoflann/third_party/nanoflann \ KarypisLab:METIS:1060348:metis/third_party/METIS \ KarypisLab:GKlib:62de20c:metis_GKlib/third_party/METIS/GKlib \ pytorch:tensorpipe:6042f1a:tensorpipe/third_party/tensorpipe \ libuv:libuv:1dff88e:tensorpipe_libuv/third_party/tensorpipe/third_party/libuv \ google:libnop:aa95422:tensorpipe_libnop/third_party/tensorpipe/third_party/libnop \ hfp:libxsmm:8009060:libxsmm/third_party/libxsmm \ NVIDIA:thrust:02931a3:thrust/third_party/thrust \ google:googletest:f71fb4f:googletest/third_party/googletest SHEBANG_GLOB= *.sh MAKE_ENV= PYTHON=${PYTHON_CMD} CMAKE_ON= BUILD_SHARED_LIBS CMAKE_TESTING_ON= BUILD_CPP_TEST # tests fail to compile, see https://github.com/dmlc/dgl/issues/5664 BINARY_ALIAS= make=${GMAKE} python3=${PYTHON_CMD} PLIST_FILES= lib/libdgl_metis.so # workaround for https://github.com/dmlc/dgl/issues/5666 OPTIONS_RADIO= BACKEND OPTIONS_RADIO_BACKEND= PYTORCH TENSORFLOW MXNET OPTIONS_DEFAULT= PYTORCH PYTORCH_DESC= Use PyTorch backend PYTORCH_VARS= BACKEND_DEPENDS=${PYTHON_PKGNAMEPREFIX}pytorch>0:misc/py-pytorch@${PY_FLAVOR} PYTORCH_MAKE_ENV= DGLBACKEND=pytorch TENSORFLOW_DESC= Use TensorFlow backend TENSORFLOW_VARS= BACKEND_DEPENDS=${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR} TENSORFLOW_MAKE_ENV= DGLBACKEND=tensorflow TENSORFLOW_CMAKE_ON= -DBUILD_SPARSE=OFF MXNET_DESC= Use MXNET backend MXNET_VARS= BACKEND_DEPENDS=${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR} MXNET_MAKE_ENV= DGLBACKEND=mxnet post-install: # workaround for https://github.com/dmlc/dgl/issues/5666 ${INSTALL_LIB} ${BUILD_WRKSRC}/third_party/METIS/libmetis/libdgl_metis.so ${STAGEDIR}${PREFIX}/lib .include diff --git a/math/dgl/distinfo b/math/dgl/distinfo index 23a0bc03634a..30b2ed9dcd88 100644 --- a/math/dgl/distinfo +++ b/math/dgl/distinfo @@ -1,33 +1,33 @@ -TIMESTAMP = 1689925226 -SHA256 (dmlc-dgl-1.1.1_GH0.tar.gz) = 076026a7818f2396056252269d7960c561840bb0fe89494e11f8d6c524891c49 -SIZE (dmlc-dgl-1.1.1_GH0.tar.gz) = 5542829 +TIMESTAMP = 1711418448 +SHA256 (dmlc-dgl-1.1.2_GH0.tar.gz) = 5b7ef998d63946e8af29507318507915bc86a77d52d241414ef78eaca74a641a +SIZE (dmlc-dgl-1.1.2_GH0.tar.gz) = 5613467 SHA256 (apache-tvm-b2e418c_GH0.tar.gz) = f351aee38d7ad4bb1025407e26d5ed21704d1daf6cb2c2b7972ec1bef11189b7 SIZE (apache-tvm-b2e418c_GH0.tar.gz) = 4105160 SHA256 (dmlc-dlpack-e2bdd3b_GH0.tar.gz) = e88e702277cf4cfa4814afdbb27b07b75041d80b3df60da387cdd7e0ebeb6817 SIZE (dmlc-dlpack-e2bdd3b_GH0.tar.gz) = 76235 SHA256 (dmlc-dmlc-core-bfad207_GH0.tar.gz) = cb9d69eef2b73349367da53f01e54f16b0b26e0f3f063360a33c6313da494fd8 SIZE (dmlc-dmlc-core-bfad207_GH0.tar.gz) = 256022 SHA256 (greg7mdp-parallel-hashmap-25293ce_GH0.tar.gz) = 79bf3c49d9a685615b6876cb668c678975762e72efc95ff27afeb04d08f3e4bc SIZE (greg7mdp-parallel-hashmap-25293ce_GH0.tar.gz) = 1991684 SHA256 (herumi-xbyak-757e406_GH0.tar.gz) = ce13e1474237d16e4e1f66601e52db18e66f2ba98037ca800c1d9e6068d67cf6 SIZE (herumi-xbyak-757e406_GH0.tar.gz) = 237424 SHA256 (imneme-pcg-cpp-428802d_GH0.tar.gz) = 94cfcaace3031f42a246ef3f01b9da04bbd51baf0a749369f085e9e25e46fdbb SIZE (imneme-pcg-cpp-428802d_GH0.tar.gz) = 78185 SHA256 (jlblancoc-nanoflann-4c47ca2_GH0.tar.gz) = 84523ebbca828309da8ef35544d14c810419d6a7ecc7a6e103049bc4f2900a9e SIZE (jlblancoc-nanoflann-4c47ca2_GH0.tar.gz) = 685221 SHA256 (KarypisLab-METIS-1060348_GH0.tar.gz) = 3d0b2741c650c8a01019e294a12e0bc85653d251fd6956486b7fcbc90314ab1d SIZE (KarypisLab-METIS-1060348_GH0.tar.gz) = 4839628 SHA256 (KarypisLab-GKlib-62de20c_GH0.tar.gz) = b10827ec6c2481aded336dd99de1d241f5c59a65e186fdc1e6d4ee57527941aa SIZE (KarypisLab-GKlib-62de20c_GH0.tar.gz) = 178104 SHA256 (pytorch-tensorpipe-6042f1a_GH0.tar.gz) = b1f269a2694d85345c90acd6d22481702e3da8c3c28c0446c5c134026edf02e8 SIZE (pytorch-tensorpipe-6042f1a_GH0.tar.gz) = 258701 SHA256 (libuv-libuv-1dff88e_GH0.tar.gz) = 5a1e54bf17161c2e8886f584e88078318ad9c902d9b7b1d9b0f3e682f43bee48 SIZE (libuv-libuv-1dff88e_GH0.tar.gz) = 1281275 SHA256 (google-libnop-aa95422_GH0.tar.gz) = a1bc9d94289868a5d40e36964d57c8e06b52cb4cfff6cc21ff259337f707d0e1 SIZE (google-libnop-aa95422_GH0.tar.gz) = 124119 SHA256 (hfp-libxsmm-8009060_GH0.tar.gz) = 51f7cf93c4a1a5d0b749e15cab5716383037bbc84dabd9634e48f2980f1ab2b9 SIZE (hfp-libxsmm-8009060_GH0.tar.gz) = 5519466 SHA256 (NVIDIA-thrust-02931a3_GH0.tar.gz) = 2596d2953c6d36fa3e39143f40b43917ca6bbc841d7642af88544134801e2510 SIZE (NVIDIA-thrust-02931a3_GH0.tar.gz) = 1004162 SHA256 (google-googletest-f71fb4f_GH0.tar.gz) = 196e6d0f943c2f741665e64ed500916fe6273d4f398007c95909ffe187704391 SIZE (google-googletest-f71fb4f_GH0.tar.gz) = 957143 diff --git a/math/dgl/files/patch-CMakeLists.txt b/math/dgl/files/patch-CMakeLists.txt index 534b82fbd7f0..f37bf6b8756d 100644 --- a/math/dgl/files/patch-CMakeLists.txt +++ b/math/dgl/files/patch-CMakeLists.txt @@ -1,20 +1,11 @@ ---- CMakeLists.txt.orig 2023-06-23 05:00:04 UTC +--- CMakeLists.txt.orig 2023-08-14 06:35:06 UTC +++ CMakeLists.txt -@@ -87,7 +87,7 @@ else(MSVC) - # tensorpipe's dependencies require C++14 - check_cxx_compiler_flag("-std=c++14" SUPPORT_CXX14) - set(CMAKE_C_FLAGS "-O2 -Wall -fPIC ${CMAKE_C_FLAGS}") -- set(CMAKE_CXX_FLAGS "-O2 -Wall -fPIC -std=c++14 ${CMAKE_CXX_FLAGS}") -+ set(CMAKE_CXX_FLAGS "-O2 -Wall -fPIC -std=c++17 ${CMAKE_CXX_FLAGS}") - if(NOT APPLE) - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--warn-common ${CMAKE_SHARED_LINKER_FLAGS}") - endif(NOT APPLE) -@@ -200,7 +200,7 @@ if(NOT MSVC) +@@ -276,7 +276,7 @@ if(NOT MSVC) include_directories(${GKLIB_PATH}) include_directories("third_party/METIS/include/") add_subdirectory("third_party/METIS/libmetis/") - list(APPEND DGL_LINKER_LIBS metis) + list(APPEND DGL_LINKER_LIBS dgl_metis) endif(NOT MSVC) # Compile LIBXSMM diff --git a/math/dgl/pkg-plist b/math/dgl/pkg-plist index 13b1820cb7d4..232778104d07 100644 --- a/math/dgl/pkg-plist +++ b/math/dgl/pkg-plist @@ -1,64 +1,63 @@ include/dmlc/any.h include/dmlc/array_view.h include/dmlc/base.h include/dmlc/blockingconcurrentqueue.h include/dmlc/build_config.h include/dmlc/build_config_default.h include/dmlc/common.h include/dmlc/concurrency.h include/dmlc/concurrentqueue.h include/dmlc/config.h include/dmlc/data.h include/dmlc/endian.h include/dmlc/filesystem.h include/dmlc/input_split_shuffle.h include/dmlc/io.h include/dmlc/json.h include/dmlc/logging.h include/dmlc/lua.h include/dmlc/memory.h include/dmlc/memory_io.h include/dmlc/omp.h include/dmlc/optional.h include/dmlc/parameter.h include/dmlc/recordio.h include/dmlc/registry.h include/dmlc/serializer.h include/dmlc/strtonum.h include/dmlc/thread_group.h include/dmlc/thread_local.h include/dmlc/threadediter.h include/dmlc/timer.h include/dmlc/type_traits.h include/tensorpipe/channel/basic/factory.h include/tensorpipe/channel/context.h include/tensorpipe/channel/error.h include/tensorpipe/channel/mpt/factory.h include/tensorpipe/channel/xth/factory.h include/tensorpipe/common/buffer.h include/tensorpipe/common/cpu_buffer.h include/tensorpipe/common/device.h include/tensorpipe/common/error.h include/tensorpipe/common/optional.h include/tensorpipe/config.h include/tensorpipe/core/context.h include/tensorpipe/core/error.h include/tensorpipe/core/listener.h include/tensorpipe/core/message.h include/tensorpipe/core/pipe.h include/tensorpipe/tensorpipe.h include/tensorpipe/transport/context.h include/tensorpipe/transport/error.h include/tensorpipe/transport/uv/error.h include/tensorpipe/transport/uv/factory.h include/tensorpipe/transport/uv/utility.h lib/cmake/dmlc/DMLCTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/dmlc/DMLCTargets.cmake lib/cmake/dmlc/dmlc-config-version.cmake lib/cmake/dmlc/dmlc-config.cmake lib/libdgl.so lib/libdmlc.so lib/libtensorpipe.so -lib/libtensorpipe_uv.a share/cmake/Tensorpipe/TensorpipeTargets-%%CMAKE_BUILD_TYPE%%.cmake share/cmake/Tensorpipe/TensorpipeTargets.cmake