From nobody Mon Nov 27 10:46:01 2023 X-Original-To: dev-commits-ports-all@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 4Sf2Ld54ryz524N2; Mon, 27 Nov 2023 10:46:01 +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 4Sf2Ld4JFcz3Gh1; Mon, 27 Nov 2023 10:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701081961; 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=HGz0uu7dulrAd/8oPr4oBch5DuSK5mdBGOgkMrrqRf0=; b=hOIu6PoB4R9IXCeDFn4tXkzgp+BV9nL4mU0c4/2xhcE4oHWgXlOJbgo3lw3AZiVIeM0VdG PZIJhgGauG69daFBi2FTd+dQKE2joFj/BoqK0NA1+h1Co+bt8iV/FEc/L6FyOm9WBbj6Ry KUDHCP8RG4xU0tNzW35vPfaVwkEK5lfs5wbn5U+J2ABaZDzQIDzly0KNwhXAt4HixI4PNF /bsD1ucPjdjdI3/us+VzmHtonjcZWoNzX7VYHsUki8s7aJmrj508rwNdgSzTfZpsRq4cjP pc1X4shCpJ+byfRSftUVdqgLvBHtRu8qta2Plv2QQMD1GaA8eSeHcMq4COwpcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701081961; 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=HGz0uu7dulrAd/8oPr4oBch5DuSK5mdBGOgkMrrqRf0=; b=GH4OoE+AO20VLIJFDTG9eMrWVqUPkE3ihGr14OC8/ZwIPfzVUYR3mQEjnP1vE7I54Ax2+U LX5qFobyYzhM0aDZnauWYVpaLp6dsMEKUNz0XcQD7EgzYrbh1J+M6VSo2nfExwI02qxSur Kmwk0RSy1Ff8cBQmX/ycbPR/9bfMMnQvlUYRB4QkR9QH1262v9W3w9JbqniFddOofji4Ok EpAn55gW6hPZlpJbVrO01phrNs6PFxofQhlVGmLoliZJ0AbWOuM73dyxDfH0AYzDd3QfIK LovvoKX2Tdh5OUF/Asz5fwR7lQIhjANGg59lUO4ehsLt9DImFA5ZkWOk2LNdvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701081961; a=rsa-sha256; cv=none; b=aWnv/zJoZSltYHkpPcaAY67YFLcsKM4C7HCGJ6XZz4qG5Cp519/T3C0XAFAVsmuj4qarCo R7na1W9i7lLPlJH+irj/hwK85g7mLW+7HW5LAri2F/3Z0W848n2QSUBUUEObUmJVpXctMO 53iUn0KqnBZhAGC2AaOgDKWDpXDzkw5gWOCNpk45rQv5PR6pR1KwhBS9ItB0RIuNi9l8UP 6XxVzLNwrDO1TTx145RVzUbmgyjCtb672if1J2fFGL1Jdmv22+yrwWVS+BbWgKDfnAXRyT wRB9oVhnGXghxnqqujOCQhk6s9J/L1cgUiyDhP9zPcnF3rPy/hjedaagXnR0ZA== 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 4Sf2Ld3JRhzb7R; Mon, 27 Nov 2023 10:46:01 +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 3ARAk1uo028615; Mon, 27 Nov 2023 10:46:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARAk11F028612; Mon, 27 Nov 2023 10:46:01 GMT (envelope-from git) Date: Mon, 27 Nov 2023 10:46:01 GMT Message-Id: <202311271046.3ARAk11F028612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 96da84adbff5 - main - misc/pytorch: Update to 2.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96da84adbff54be3917b922df418b037d2fc0cc6 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=96da84adbff54be3917b922df418b037d2fc0cc6 commit 96da84adbff54be3917b922df418b037d2fc0cc6 Author: Po-Chuan Hsieh AuthorDate: 2023-11-27 10:45:51 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-27 10:45:51 +0000 misc/pytorch: Update to 2.1.0 - Add LICENSE_FILE - Remove PYTHON_EXECUTABLE which is set by USES=python now - Comment BROKEN_* temporarily to see if the new version builds Changes: https://github.com/pytorch/pytorch/releases PR: 274859 Approved by: maintainer (timeout, 25 days) --- misc/pytorch/files/patch-CMakeLists.txt | 39 ++++++++++++++++++++++ ...aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h | 11 ++++++ ...aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h | 11 ++++++ misc/pytorch/files/patch-c10_core_DynamicCast.h | 21 ++++++++++++ misc/pytorch/files/patch-caffe2_CMakeLists.txt | 11 ++++++ .../files/patch-caffe2_proto_CMakeLists.txt | 8 +++++ 6 files changed, 101 insertions(+) diff --git a/misc/pytorch/files/patch-CMakeLists.txt b/misc/pytorch/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..9ebebccbf2e3 --- /dev/null +++ b/misc/pytorch/files/patch-CMakeLists.txt @@ -0,0 +1,39 @@ +--- CMakeLists.txt.orig 2023-04-03 19:45:59 UTC ++++ CMakeLists.txt +@@ -138,7 +138,7 @@ endif() + set(CPU_AARCH64 OFF) + set(CPU_INTEL OFF) + +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|x86_64)") ++if(CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64|x86_64)") + set(CPU_INTEL ON) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)") + set(CPU_AARCH64 ON) +@@ -163,7 +163,7 @@ include(CMakeDependentOption) + option(ATEN_NO_TEST "Do not build ATen test binaries" OFF) + option(BUILD_BINARY "Build C++ binaries" OFF) + option(BUILD_DOCS "Build Caffe2 documentation" OFF) +-option(BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" ON) ++option(BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" OFF) + option(BUILD_PYTHON "Build Python binaries" ON) + option(BUILD_CAFFE2 "Master flag to build Caffe2" OFF) + option(BUILD_LITE_INTERPRETER "Master flag to build Lite Interpreter" OFF) +@@ -398,15 +398,15 @@ endif() + # USE_SYSTEM_LIBS being "OFF". + option(USE_SYSTEM_LIBS "Use all available system-provided libraries." OFF) + option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo." OFF) +-option(USE_SYSTEM_SLEEF "Use system-provided sleef." OFF) ++option(USE_SYSTEM_SLEEF "Use system-provided sleef." ON) + option(USE_SYSTEM_GLOO "Use system-provided gloo." OFF) + option(USE_SYSTEM_FP16 "Use system-provided fp16." OFF) +-option(USE_SYSTEM_PYBIND11 "Use system-provided PyBind11." OFF) ++option(USE_SYSTEM_PYBIND11 "Use system-provided PyBind11." ON) + option(USE_SYSTEM_PTHREADPOOL "Use system-provided pthreadpool." OFF) + option(USE_SYSTEM_PSIMD "Use system-provided psimd." OFF) + option(USE_SYSTEM_FXDIV "Use system-provided fxdiv." OFF) + option(USE_SYSTEM_BENCHMARK "Use system-provided google benchmark." OFF) +-option(USE_SYSTEM_ONNX "Use system-provided onnx." OFF) ++option(USE_SYSTEM_ONNX "Use system-provided onnx." ON) + option(USE_SYSTEM_XNNPACK "Use system-provided xnnpack." OFF) + option(USE_GOLD_LINKER "Use ld.gold to link" OFF) + if(USE_SYSTEM_LIBS) 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 new file mode 100644 index 000000000000..5923cd93c2cd --- /dev/null +++ b/misc/pytorch/files/patch-aten_src_ATen_cpu_vec_vec256_vec256__bfloat16.h @@ -0,0 +1,11 @@ +--- 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 +@@ -266,7 +266,7 @@ static_assert( (public) + } + return b; + } +- Vectorized map(const __m256 (*const vop)(__m256)) const { ++ Vectorized map(__m256 (*const vop)(__m256)) const { + __m256 lo, hi; + cvt_to_fp32(values, lo, hi); + const auto o1 = vop(lo); diff --git a/misc/pytorch/files/patch-aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h b/misc/pytorch/files/patch-aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h new file mode 100644 index 000000000000..80e0b1832434 --- /dev/null +++ b/misc/pytorch/files/patch-aten_src_ATen_cpu_vec_vec512_vec512__bfloat16.h @@ -0,0 +1,11 @@ +--- 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 +@@ -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 { + __m512 lo, hi; + cvt_to_fp32(values, lo, hi); + const auto o1 = vop(lo); diff --git a/misc/pytorch/files/patch-c10_core_DynamicCast.h b/misc/pytorch/files/patch-c10_core_DynamicCast.h new file mode 100644 index 000000000000..517085e8bdee --- /dev/null +++ b/misc/pytorch/files/patch-c10_core_DynamicCast.h @@ -0,0 +1,21 @@ +- workaround for the failuree diring math/dgl build: +- /usr/local/lib/python3.9/site-packages/torch/include/c10/core/DynamicCast.h:112:22: error: use of undeclared identifier '__assert_fail' + +--- c10/core/DynamicCast.h.orig 2023-05-10 02:37:18 UTC ++++ c10/core/DynamicCast.h +@@ -99,13 +99,13 @@ C10_HOST_DEVICE inline void cast_and_store( + template <> \ + C10_HOST_DEVICE inline T fetch_and_cast( \ + const ScalarType src_type, const void* ptr) { \ +- CUDA_KERNEL_ASSERT(ScalarType::scalartype_ == src_type); \ ++ assert(ScalarType::scalartype_ == src_type); \ + return c10::load(ptr); \ + } \ + template <> \ + C10_HOST_DEVICE inline void cast_and_store( \ + const ScalarType dest_type, void* ptr, T value) { \ +- CUDA_KERNEL_ASSERT(ScalarType::scalartype_ == dest_type); \ ++ assert(ScalarType::scalartype_ == dest_type); \ + *(T*)ptr = value; \ + } + diff --git a/misc/pytorch/files/patch-caffe2_CMakeLists.txt b/misc/pytorch/files/patch-caffe2_CMakeLists.txt new file mode 100644 index 000000000000..ca8e239a6d85 --- /dev/null +++ b/misc/pytorch/files/patch-caffe2_CMakeLists.txt @@ -0,0 +1,11 @@ +--- caffe2/CMakeLists.txt.orig 2023-05-08 19:58:16 UTC ++++ caffe2/CMakeLists.txt +@@ -1,6 +1,8 @@ + # ---[ Generate and install header and cpp files + include(../cmake/Codegen.cmake) + ++set(CMAKE_CXX_STANDARD 17) ++ + # ---[ Vulkan code gen + if(USE_VULKAN) + include(../cmake/VulkanCodegen.cmake) diff --git a/misc/pytorch/files/patch-caffe2_proto_CMakeLists.txt b/misc/pytorch/files/patch-caffe2_proto_CMakeLists.txt new file mode 100644 index 000000000000..1df1849c0556 --- /dev/null +++ b/misc/pytorch/files/patch-caffe2_proto_CMakeLists.txt @@ -0,0 +1,8 @@ +--- caffe2/proto/CMakeLists.txt.orig 2023-05-08 19:58:16 UTC ++++ caffe2/proto/CMakeLists.txt +@@ -1,3 +1,5 @@ ++set(CMAKE_CXX_STANDARD 17) ++ + if(BUILD_CAFFE2) + file(GLOB Caffe2_PROTOBUF_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.proto") + else()