Date: Wed, 24 Apr 2024 21:25:53 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fe3c71c53ce4 - main - misc/pytorch: update 2.2.1 =?utf-8?Q?=E2=86=92?= 2.2.2 Message-ID: <202404242125.43OLPrYj085563@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe3c71c53ce493d33cf35829db0c41f113464256 commit fe3c71c53ce493d33cf35829db0c41f113464256 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2024-04-24 21:20:33 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2024-04-24 21:25:48 +0000 misc/pytorch: update 2.2.1 → 2.2.2 --- misc/pytorch/Makefile | 4 +++- misc/pytorch/distinfo | 6 +++--- ...aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h | 4 ++-- misc/pytorch/files/patch-cmake_Dependencies.cmake | 21 +++++++++++++++++- ...ch-third__party_kineto_libkineto_CMakeLists.txt | 11 ++++++++++ misc/pytorch/pkg-plist | 25 +++------------------- 6 files changed, 42 insertions(+), 29 deletions(-) diff --git a/misc/pytorch/Makefile b/misc/pytorch/Makefile index 6954c1d2872c..780bdba53a62 100644 --- a/misc/pytorch/Makefile +++ b/misc/pytorch/Makefile @@ -1,6 +1,6 @@ PORTNAME= pytorch DISTVERSIONPREFIX= v -DISTVERSION= 2.2.1 +DISTVERSION= 2.2.2 CATEGORIES= misc # machine-learning MASTER_SITES= https://github.com/pytorch/pytorch/releases/download/v${DISTVERSION}/ DIST_SUBDIR= ${PORTNAME} @@ -66,6 +66,8 @@ post-patch: @cd ${WRKSRC} && for f in $$(${GREP} -rl "include <malloc\.h>" * | ${GREP} -E "\.(c|cpp|h|hpp)$$"); do \ ${REINPLACE_CMD} -i'' -E "s|include <malloc\.h>|include <stdlib.h>|" $$f; \ done + # remove bundled fmt + @${RM} -r ${WRKSRC}/third_party/fmt post-install: # functorch.so is installed back into the source directory, see https://github.com/pytorch/pytorch/issues/91524 diff --git a/misc/pytorch/distinfo b/misc/pytorch/distinfo index 540cab721e03..cdcc31006860 100644 --- a/misc/pytorch/distinfo +++ b/misc/pytorch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708789079 -SHA256 (pytorch/pytorch-v2.2.1.tar.gz) = 8069467387b8ab7a7279671b9144d80a5c5342b4fa022eb3c1db629a6fd806c9 -SIZE (pytorch/pytorch-v2.2.1.tar.gz) = 287453242 +TIMESTAMP = 1713844760 +SHA256 (pytorch/pytorch-v2.2.2.tar.gz) = 57a1136095bdfe769acb87876dce77212da2c995c61957a67a1f16172d235d17 +SIZE (pytorch/pytorch-v2.2.2.tar.gz) = 288213626 diff --git a/misc/pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h b/misc/pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h index 5923cd93c2cd..e03ac51d837b 100644 --- a/misc/pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h +++ b/misc/pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h @@ -1,6 +1,6 @@ ---- aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h.orig 2023-10-12 12:49:42 UTC +--- aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h.orig 2024-03-27 22:28:51 UTC +++ aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h -@@ -266,7 +266,7 @@ static_assert( (public) +@@ -265,7 +265,7 @@ static_assert( (public) } return b; } diff --git a/misc/pytorch/files/patch-cmake_Dependencies.cmake b/misc/pytorch/files/patch-cmake_Dependencies.cmake index 0b1436e51889..7a37b5cd8c6c 100644 --- a/misc/pytorch/files/patch-cmake_Dependencies.cmake +++ b/misc/pytorch/files/patch-cmake_Dependencies.cmake @@ -1,4 +1,4 @@ ---- cmake/Dependencies.cmake.orig 2023-05-08 19:58:16 UTC +--- cmake/Dependencies.cmake.orig 2024-03-27 22:28:51 UTC +++ cmake/Dependencies.cmake @@ -1,3 +1,5 @@ +set(CMAKE_CXX_STANDARD 17) @@ -6,3 +6,22 @@ # RPATH stuff # see https://cmake.org/Wiki/CMake_RPATH_handling if(APPLE) +@@ -1796,7 +1798,8 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared lib + # + set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) +-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) ++#add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) ++find_package(fmt REQUIRED) + + # Disable compiler feature checks for `fmt`. + # +@@ -1805,7 +1808,7 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt + # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know + # `fmt` is compatible with a superset of the compilers that PyTorch is, it + # shouldn't be too bad to just disable the checks. +-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "") ++#set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "") + + list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only) + set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) diff --git a/misc/pytorch/files/patch-third__party_kineto_libkineto_CMakeLists.txt b/misc/pytorch/files/patch-third__party_kineto_libkineto_CMakeLists.txt new file mode 100644 index 000000000000..c55703582033 --- /dev/null +++ b/misc/pytorch/files/patch-third__party_kineto_libkineto_CMakeLists.txt @@ -0,0 +1,11 @@ +--- third_party/kineto/libkineto/CMakeLists.txt.orig 2024-04-24 18:15:39 UTC ++++ third_party/kineto/libkineto/CMakeLists.txt +@@ -111,7 +111,7 @@ target_compile_options(kineto_api PRIVATE "${KINETO_CO + target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}") + target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}") + +-if(NOT TARGET fmt) ++if(NOT TARGET fmt::fmt) + if(NOT FMT_SOURCE_DIR) + set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt" + CACHE STRING "fmt source directory from submodules") diff --git a/misc/pytorch/pkg-plist b/misc/pytorch/pkg-plist index 86f09e343366..0c609f56a2fa 100644 --- a/misc/pytorch/pkg-plist +++ b/misc/pytorch/pkg-plist @@ -8203,19 +8203,6 @@ include/dnnl_threadpool.hpp include/dnnl_threadpool_iface.hpp include/dnnl_types.h include/dnnl_version.h -include/fmt/args.h -include/fmt/chrono.h -include/fmt/color.h -include/fmt/compile.h -include/fmt/core.h -include/fmt/format-inl.h -include/fmt/format.h -include/fmt/os.h -include/fmt/ostream.h -include/fmt/printf.h -include/fmt/ranges.h -include/fmt/std.h -include/fmt/xchar.h include/fp16.h include/fp16/__init__.py include/fp16/avx.py @@ -9183,18 +9170,13 @@ lib/cmake/dnnl/dnnl-config-version.cmake lib/cmake/dnnl/dnnl-config.cmake lib/cmake/dnnl/dnnl-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/dnnl/dnnl-targets.cmake -lib/cmake/fmt/fmt-config-version.cmake -lib/cmake/fmt/fmt-config.cmake -lib/cmake/fmt/fmt-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/fmt/fmt-targets.cmake -%%AMD64%%lib/libCaffe2_perfkernels_avx.a -%%AMD64%%lib/libCaffe2_perfkernels_avx2.a -%%AMD64%%lib/libCaffe2_perfkernels_avx512.a +lib/libCaffe2_perfkernels_avx.a +lib/libCaffe2_perfkernels_avx2.a +lib/libCaffe2_perfkernels_avx512.a lib/libc10.so lib/libclog.a lib/libcpuinfo.a lib/libdnnl.a -lib/libfmt.a lib/libkineto.a lib/libshm.so lib/libtorch.so @@ -9203,7 +9185,6 @@ lib/libtorch_global_deps.so lib/libtorch_python.so %%PYTHON_SITELIBDIR%%/caffe2/proto/caffe2_pb2.py %%PYTHON_SITELIBDIR%%/caffe2/proto/torch_pb2.py -libdata/pkgconfig/fmt.pc libdata/pkgconfig/libcpuinfo.pc share/ATen/Declarations.yaml share/cmake/ATen/ATenConfig.cmake
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404242125.43OLPrYj085563>