From patchwork Thu Oct 13 21:04:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 43383 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6A37D27BBEA; Thu, 13 Oct 2022 22:06:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC46A27BBE9 for ; Thu, 13 Oct 2022 22:06:33 +0100 (BST) Received: from localhost ([::1]:49608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oj5PU-0002jg-Tx for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 17:06:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oj5O3-0002fh-UV for guix-patches@gnu.org; Thu, 13 Oct 2022 17:05:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oj5O3-0007Mk-MJ for guix-patches@gnu.org; Thu, 13 Oct 2022 17:05:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oj5O3-0005jD-GD for guix-patches@gnu.org; Thu, 13 Oct 2022 17:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58261] [PATCH v3 02/15] gnu: Add pocketfft-cpp. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Oct 2022 21:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58261@debbugs.gnu.org Cc: David Elsing Received: via spool by 58261-submit@debbugs.gnu.org id=B58261.166569509621940 (code B ref 58261); Thu, 13 Oct 2022 21:05:03 +0000 Received: (at 58261) by debbugs.gnu.org; 13 Oct 2022 21:04:56 +0000 Received: from localhost ([127.0.0.1]:35125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oj5Nv-0005he-7p for submit@debbugs.gnu.org; Thu, 13 Oct 2022 17:04:56 -0400 Received: from mout02.posteo.de ([185.67.36.66]:35171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oj5Nt-0005gz-1u for 58261@debbugs.gnu.org; Thu, 13 Oct 2022 17:04:53 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8CB86240104 for <58261@debbugs.gnu.org>; Thu, 13 Oct 2022 23:04:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1665695087; bh=ZEQwkGyZhylBk05fowt1HYDbjUAw+eHEYckcxP4pMUA=; h=From:To:Cc:Subject:Date:From; b=mUB0Eec9HXSiv4uRis/b5tG1gpE2qzwkeBkCqgf+Th+0LF4HJ5lRbZ0w+RDOgaJag c15Lu7imk1wGk7MpwvwZ5XexT+ZuK6SnpWlJfWdHBp8XDtQrRS5x/xTYs8vXo8KwsF VHf6Lp8abAxj/o0Yb/HfJkOpiwABZZkW+ZTMGPzd05tMcXIsbWPFzRTfTlqcH287W9 wegHvaYH/YeVoL4AoVxKD5DRjLwW2rAwhRdCUhLMU9nStngI6YuNUK3+HAiBl7uygd 1c3tg/lxEjhV6IeFvJh/DySjXiSzW9/Fh0uWdiIVvtnN6INxCV1rcyzufBsoJMrpCN n2nmmrFsakKXw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MpMTq0tmFz6tr3; Thu, 13 Oct 2022 23:04:47 +0200 (CEST) From: David Elsing Date: Thu, 13 Oct 2022 21:04:11 +0000 Message-Id: <20221013210424.993-3-david.elsing@posteo.net> In-Reply-To: <20221007152148.32591-1-david.elsing@posteo.net> References: <20221007152148.32591-1-david.elsing@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (pocketfft-cpp): New variable. --- gnu/packages/cpp.scm | 29 +++++ .../pocketfft-cpp-default-disable-simd.patch | 108 ++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 gnu/packages/patches/pocketfft-cpp-default-disable-simd.patch diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index eba39ed660..2b5841e777 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2004,3 +2004,32 @@ (define-public fast-float floating point numbers from strings. It implements the C++ from_chars functions for the float and double types.") (license (list license:asl2.0 license:expat)))) ; dual licensed + +(define-public pocketfft-cpp + (let ((commit "daa8bb18327bc5c7d22c69428c25cf5dc64167d3") + (revision "0")) + (package + (name "pocketfft-cpp") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mreineck/pocketfft") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1dbkkqkmkxgmz1qjpsqzic5ig3qw1pqndbb3dvjc7xq5f2rdzyq1")) + (patches (search-patches + "pocketfft-cpp-default-disable-simd.patch")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan + #~'(("pocketfft_hdronly.h" "include/")))) + (home-page "https://github.com/mreineck/pocketfft") + (synopsis "C++11 header-only Fast Fourier Transform library") + (description "This package provides a single-header C++11 library for +computing Fast Fourier transformations. It supports multidimensional arrays, +different floating point sizes and complex transformations.") + (license license:bsd-3)))) diff --git a/gnu/packages/patches/pocketfft-cpp-default-disable-simd.patch b/gnu/packages/patches/pocketfft-cpp-default-disable-simd.patch new file mode 100644 index 0000000000..4d2ddae4b5 --- /dev/null +++ b/gnu/packages/patches/pocketfft-cpp-default-disable-simd.patch @@ -0,0 +1,108 @@ +Disable SIMD instructions by default. +They can be enabled by setting -DPOCKETFFT_NO_VECTORS=0. + +diff --git a/pocketfft_hdronly.h b/pocketfft_hdronly.h +index d75ada6..b2d0a23 100644 +--- a/pocketfft_hdronly.h ++++ b/pocketfft_hdronly.h +@@ -39,6 +39,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifndef POCKETFFT_HDRONLY_H + #define POCKETFFT_HDRONLY_H + ++#ifndef POCKETFFT_NO_VECTORS ++#define POCKETFFT_NO_VECTORS 1 ++#endif ++ + #ifndef __cplusplus + #error This file is C++ and requires a C++ compiler. + #endif +@@ -106,29 +110,29 @@ constexpr bool FORWARD = true, + BACKWARD = false; + + // only enable vector support for gcc>=5.0 and clang>=5.0 +-#ifndef POCKETFFT_NO_VECTORS +-#define POCKETFFT_NO_VECTORS ++#if !(POCKETFFT_NO_VECTORS) ++#define POCKETFFT_NO_VECTORS 1 + #if defined(__INTEL_COMPILER) + // do nothing. This is necessary because this compiler also sets __GNUC__. + #elif defined(__clang__) + // AppleClang has their own version numbering + #ifdef __apple_build_version__ + # if (__clang_major__ > 9) || (__clang_major__ == 9 && __clang_minor__ >= 1) +-# undef POCKETFFT_NO_VECTORS ++#define POCKETFFT_NO_VECTORS 0 + # endif + #elif __clang_major__ >= 5 +-# undef POCKETFFT_NO_VECTORS ++#define POCKETFFT_NO_VECTORS 0 + #endif + #elif defined(__GNUC__) + #if __GNUC__>=5 +-#undef POCKETFFT_NO_VECTORS ++#define POCKETFFT_NO_VECTORS 0 + #endif + #endif + #endif + + template struct VLEN { static constexpr size_t val=1; }; + +-#ifndef POCKETFFT_NO_VECTORS ++#if !(POCKETFFT_NO_VECTORS) + #if (defined(__AVX512F__)) + template<> struct VLEN { static constexpr size_t val=16; }; + template<> struct VLEN { static constexpr size_t val=8; }; +@@ -145,7 +149,7 @@ template<> struct VLEN { static constexpr size_t val=2; }; + template<> struct VLEN { static constexpr size_t val=4; }; + template<> struct VLEN { static constexpr size_t val=2; }; + #else +-#define POCKETFFT_NO_VECTORS ++#define POCKETFFT_NO_VECTORS 1 + #endif + #endif + +@@ -180,7 +184,7 @@ template class arr + T *p; + size_t sz; + +-#if defined(POCKETFFT_NO_VECTORS) ++#if POCKETFFT_NO_VECTORS + static T *ralloc(size_t num) + { + if (num==0) return nullptr; +@@ -3026,7 +3030,7 @@ class rev_iter + template struct VTYPE {}; + template using vtype_t = typename VTYPE::type; + +-#ifndef POCKETFFT_NO_VECTORS ++#if !(POCKETFFT_NO_VECTORS) + template<> struct VTYPE + { + using type = float __attribute__ ((vector_size (VLEN::val*sizeof(float)))); +@@ -3139,7 +3143,7 @@ POCKETFFT_NOINLINE void general_nd(const cndarr &in, ndarr &out, + auto storage = alloc_tmp(in.shape(), len, sizeof(T)); + const auto &tin(iax==0? in : out); + multi_iter it(tin, out, axes[iax]); +-#ifndef POCKETFFT_NO_VECTORS ++#if !(POCKETFFT_NO_VECTORS) + if (vlen>1) + while (it.remaining()>=vlen) + { +@@ -3245,7 +3249,7 @@ template POCKETFFT_NOINLINE void general_r2c( + constexpr auto vlen = VLEN::val; + auto storage = alloc_tmp(in.shape(), len, sizeof(T)); + multi_iter it(in, out, axis); +-#ifndef POCKETFFT_NO_VECTORS ++#if !(POCKETFFT_NO_VECTORS) + if (vlen>1) + while (it.remaining()>=vlen) + { +@@ -3300,7 +3304,7 @@ template POCKETFFT_NOINLINE void general_c2r( + constexpr auto vlen = VLEN::val; + auto storage = alloc_tmp(out.shape(), len, sizeof(T)); + multi_iter it(in, out, axis); +-#ifndef POCKETFFT_NO_VECTORS ++#if !(POCKETFFT_NO_VECTORS) + if (vlen>1) + while (it.remaining()>=vlen) + {