From nobody Tue Oct 17 02:26:59 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S8dCl5cLbz4wtZg; Tue, 17 Oct 2023 02:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8dCl4vDjz3WMb; Tue, 17 Oct 2023 02:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697509619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qek4FocqsCaqU5+PJ3hfxmOKuTO39P73CK+5OAu+0w=; b=WutbrNvDeGORkwznXRzZTqXM07jS4V+inmItBPeKpq5HIyEGmtXU5Rsa2mHuOpq1F/C8hb Nny3Gt52d/pMidMLhQLsJWanrk9ZlwguAB0kfJfRMfrBrj9dc7y/N0eGyYk1xjhXoOgJwL hFf0ANhmwxpZiWpQglqOipGTj0qSPU9uqx6Rfwa48/9Q8AHtOhhzOQRhyEyNNrJLE5QEmp fFzaHYp7wzQ6aqdJDoPQL1Z7C7n+kbh/+wZinWWIW0+kj2H3lcfx3b7c6WX4zWVQxg8bm9 jTYfy3GAyZVxJCQCZVviZuANn0AksENFmqlnops9fXfNy59DpVE9tqb1h4cXbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697509619; a=rsa-sha256; cv=none; b=h31gqtm5Hl4tmuGsLOB+iz+iIp6tkxOhzYYQcLT50wqw9EqzqLBpMS+NYaSrXfm4fF7fwO pSG8VV4SRCJmvLCHsMneArcnfXt+khbeSEgSWyfB+tfR5HDjL2yKtzSp5WYlK5X/HGZnmO ePTZV48ySX5M1mfJ4nWTpTpHrP/m+6dBQRlLEOd32g8+SjZZsW4LIpajjrA+P4EvJDI/OM 19UoWaXqfA1FlT80TDiBCi4cEXgys1L2bvRjJ4knWLO2CGNxKMWOlnE6WhazhbDJk35+7L XY+mWUGgdttTSI16L1UUxhfddpkGsjaEFNCkMJuJ5RJUVeSnnP7kCPsY99zk2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697509619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qek4FocqsCaqU5+PJ3hfxmOKuTO39P73CK+5OAu+0w=; b=GEeTDQYbqiR9tKywQx5FgySCe5Ojyzd8B6QFzf9BSybcZWjtsFhsFcWkZ27HJLdhCD5W6W 77wmLEKcfcSu8VnJMpfueKK0hwbGOGH/zz9eVtdROasX8wfzK/cVypznPz6zKG23ozl0vj eAyLAfriMm+rDVz7zsFVjeKFLil0Fs2ymcGqF0cOYJOECAUYAQzYw5MFLjJE1WDOPzylN+ U7TS5BpEA77KvUIquCBJWhImBIfyyaa/xwc5jEIOL32EGqFZ/E6/VOVCQ5d66VFpmkwW3M P2oFt+FsJe9DqephzzKHVD6Z6TUscBAnFlz9V73hxWTeDLb88h4oJ+BvxXWL4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S8dCl3xjpz14gw; Tue, 17 Oct 2023 02:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39H2QxCN079472; Tue, 17 Oct 2023 02:26:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39H2QxZ9079469; Tue, 17 Oct 2023 02:26:59 GMT (envelope-from git) Date: Tue, 17 Oct 2023 02:26:59 GMT Message-Id: <202310170226.39H2QxZ9079469@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 50936df61c82 - main - misc/py-pytorch: update 2.0.1 =?utf-8?Q?=E2=86=92?= 2.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50936df61c8206049839a0040734059703e529b9 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=50936df61c8206049839a0040734059703e529b9 commit 50936df61c8206049839a0040734059703e529b9 Author: Wen Heping AuthorDate: 2023-10-17 02:25:49 +0000 Commit: Yuri Victorovich CommitDate: 2023-10-17 02:26:53 +0000 misc/py-pytorch: update 2.0.1 → 2.1.0 PR: 274514 --- misc/py-pytorch/Makefile | 3 +-- misc/py-pytorch/distinfo | 6 +++--- ...tch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h | 10 +++++----- ...tch-aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h | 10 +++++----- .../files/patch-third__party_cpuinfo_CMakeLists.txt | 18 +++++++++--------- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/misc/py-pytorch/Makefile b/misc/py-pytorch/Makefile index fc421739309b..cdf87794c265 100644 --- a/misc/py-pytorch/Makefile +++ b/misc/py-pytorch/Makefile @@ -1,6 +1,6 @@ PORTNAME= pytorch DISTVERSIONPREFIX= v -DISTVERSION= 2.0.1 +DISTVERSION= 2.1.0 CATEGORIES= misc # machine-learning MASTER_SITES= https://github.com/pytorch/pytorch/releases/download/v${DISTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -60,7 +60,6 @@ post-install: # strip binaries @${STRIP_CMD} \ ${STAGEDIR}${PYTHON_SITELIBDIR}/torch/bin/torch_shm_manager \ ${STAGEDIR}${PYTHON_SITELIBDIR}/torch/_C${PYTHON_EXT_SUFFIX}.so \ - ${STAGEDIR}${PYTHON_SITELIBDIR}/torch/_C_flatbuffer${PYTHON_EXT_SUFFIX}.so \ ${STAGEDIR}${PYTHON_SITELIBDIR}/functorch/_C${PYTHON_EXT_SUFFIX}.so \ ${STAGEDIR}${PYTHON_SITELIBDIR}/torch/lib/lib*.so diff --git a/misc/py-pytorch/distinfo b/misc/py-pytorch/distinfo index 9731f1012f9c..654de6ea7ac3 100644 --- a/misc/py-pytorch/distinfo +++ b/misc/py-pytorch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691477737 -SHA256 (pytorch/pytorch-v2.0.1.tar.gz) = 9c564ca440265c69400ef5fdd48bf15e28af5aa4bed84c95efaad960a6699998 -SIZE (pytorch/pytorch-v2.0.1.tar.gz) = 276717260 +TIMESTAMP = 1697035721 +SHA256 (pytorch/pytorch-v2.1.0.tar.gz) = 631c71f7f7d6174952f35b5ed4a45ec115720a4ef3eb619678de5893af54f403 +SIZE (pytorch/pytorch-v2.1.0.tar.gz) = 283041980 diff --git a/misc/py-pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h b/misc/py-pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h index 1fb789eebb7b..5923cd93c2cd 100644 --- a/misc/py-pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h +++ b/misc/py-pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h @@ -1,11 +1,11 @@ ---- aten/src/ATen/cpu/vec/vec256/vec256_bfloat16.h.orig 2023-05-07 16:59:15 UTC +--- 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 -@@ -206,7 +206,7 @@ template <> class Vectorized { (public) +@@ -266,7 +266,7 @@ static_assert( (public) } return b; } -- Vectorized map(const __m256 (*const vop)(__m256)) const { -+ Vectorized map(__m256 (*const vop)(__m256)) const { +- Vectorized map(const __m256 (*const vop)(__m256)) const { ++ Vectorized map(__m256 (*const vop)(__m256)) const { __m256 lo, hi; - cvtbf16_fp32(values, lo, hi); + cvt_to_fp32(values, lo, hi); const auto o1 = vop(lo); diff --git a/misc/py-pytorch/files/patch-aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h b/misc/py-pytorch/files/patch-aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h index 59081cf2f2b0..80e0b1832434 100644 --- a/misc/py-pytorch/files/patch-aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h +++ b/misc/py-pytorch/files/patch-aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h @@ -1,11 +1,11 @@ ---- aten/src/ATen/cpu/vec/vec512/vec512_bfloat16.h.orig 2023-05-07 17:07:36 UTC +--- aten/src/ATen/cpu/vec/vec512/vec512_bfloat16.h.orig 2023-10-12 12:54:40 UTC +++ aten/src/ATen/cpu/vec/vec512/vec512_bfloat16.h -@@ -283,7 +283,7 @@ template <> class Vectorized { (public) +@@ -345,7 +345,7 @@ static_assert( (public) } #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wignored-qualifiers" -- Vectorized map(const __m512 (*const vop)(__m512)) const { -+ Vectorized map(__m512 (*const vop)(__m512)) const { +- Vectorized map(const __m512 (*const vop)(__m512)) const { ++ Vectorized map(__m512 (*const vop)(__m512)) const { __m512 lo, hi; - cvtbf16_fp32(values, lo, hi); + cvt_to_fp32(values, lo, hi); const auto o1 = vop(lo); diff --git a/misc/py-pytorch/files/patch-third__party_cpuinfo_CMakeLists.txt b/misc/py-pytorch/files/patch-third__party_cpuinfo_CMakeLists.txt index 2b01f115b89e..059eaaedadcf 100644 --- a/misc/py-pytorch/files/patch-third__party_cpuinfo_CMakeLists.txt +++ b/misc/py-pytorch/files/patch-third__party_cpuinfo_CMakeLists.txt @@ -1,6 +1,6 @@ ---- third_party/cpuinfo/CMakeLists.txt.orig 2023-04-03 19:46:00 UTC +--- third_party/cpuinfo/CMakeLists.txt.orig 2023-10-16 12:32:17 UTC +++ third_party/cpuinfo/CMakeLists.txt -@@ -65,7 +65,7 @@ IF(NOT CMAKE_SYSTEM_PROCESSOR) +@@ -77,7 +77,7 @@ IF(NOT CMAKE_SYSTEM_PROCESSOR) "cpuinfo will compile, but cpuinfo_initialize() will always fail.") SET(CPUINFO_SUPPORTED_PLATFORM FALSE) ENDIF() @@ -9,16 +9,16 @@ MESSAGE(WARNING "Target processor architecture \"${CPUINFO_TARGET_PROCESSOR}\" is not supported in cpuinfo. " "cpuinfo will compile, but cpuinfo_initialize() will always fail.") -@@ -77,7 +77,7 @@ IF(NOT CMAKE_SYSTEM_NAME) +@@ -89,7 +89,7 @@ IF(NOT CMAKE_SYSTEM_NAME) "Target operating system is not specified. " "cpuinfo will compile, but cpuinfo_initialize() will always fail.") SET(CPUINFO_SUPPORTED_PLATFORM FALSE) --ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS|Darwin|Linux|Android)$") -+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|CYGWIN|MSYS|Darwin|Linux|FreeBSD|Android)$") +-ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android)$") ++ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|FreeBSD|Android)$") IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT CMAKE_SYSTEM_NAME STREQUAL "iOS") MESSAGE(WARNING "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. " -@@ -123,7 +123,7 @@ SET(CPUINFO_SRCS +@@ -135,7 +135,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM) src/cache.c) IF(CPUINFO_SUPPORTED_PLATFORM) @@ -27,7 +27,7 @@ LIST(APPEND CPUINFO_SRCS src/x86/init.c src/x86/info.c -@@ -324,7 +324,7 @@ ENDIF() +@@ -341,7 +341,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_T # ---[ cpuinfo mock library and mock tests IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_TESTS) SET(CPUINFO_MOCK_SRCS "${CPUINFO_SRCS}") @@ -36,7 +36,7 @@ LIST(APPEND CPUINFO_MOCK_SRCS src/x86/mockcpuid.c) ENDIF() IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") -@@ -768,7 +768,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_T +@@ -785,7 +785,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_T ADD_TEST(NAME get-current-test COMMAND get-current-test) ENDIF() @@ -45,7 +45,7 @@ ADD_EXECUTABLE(brand-string-test test/name/brand-string.cc) CPUINFO_TARGET_ENABLE_CXX11(brand-string-test) CPUINFO_TARGET_RUNTIME_LIBRARY(brand-string-test) -@@ -835,7 +835,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_TOOLS) +@@ -852,7 +852,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_TOOLS) CPUINFO_TARGET_RUNTIME_LIBRARY(cpuinfo-dump) ENDIF()