From nobody Sun Jun 12 08:29:31 2022 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 1D618854793; Sun, 12 Jun 2022 08:29:32 +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 4LLSY80G3Cz4XSw; Sun, 12 Jun 2022 08:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655022572; 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=v5jDf6dB1x1mXVSotvmIOSie/wq6+/tJNlIq22DV9eQ=; b=bq6jM31auEFLBoWT2xaJyV287Np0R5Qm6HH/EV+NoMlxMFw4ab7QEA3+TByJft6l2hfG56 YAuMoHDRXDkWO9g8oO3C7c04vKXMBztaDVHg7Lv1BP+aj+aw/HgHo7X/h1BPWPS0hVH05U 74GJ+LmvmpWdx5p7ZR67035ZIj6HCqcvudMD1MkmqOHhDJfFNX6KiO0L0PbA2WtqfYIPZ+ 2xn4Vxzf0EHIZT997X2DOQWZf7CoOz2cM3DbG7iiFbisRYMfAyOjNaKnZgICym0M4yNxoH TEdm4c67576JOG2qoauEBXkwUYyBna+10VDD4gVp5VAOeS9wxXrCju0ogMTTfw== 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 DAA0F1D96C; Sun, 12 Jun 2022 08:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25C8TVnN079524; Sun, 12 Jun 2022 08:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25C8TVb0079522; Sun, 12 Jun 2022 08:29:31 GMT (envelope-from git) Date: Sun, 12 Jun 2022 08:29:31 GMT Message-Id: <202206120829.25C8TVb0079522@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Chris Rees Subject: git: 34ece0398799 - main - science/libtensorflow1: add flavour without AVX 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: crees X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34ece039879999c9eb41b4d9484ca51451b30fdf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655022572; 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=v5jDf6dB1x1mXVSotvmIOSie/wq6+/tJNlIq22DV9eQ=; b=ccsXdvnTti3skwuiOUSlxhb42KBkqRno7XNL4vL7iMW6FRDNbpuujcequDNH7EtdR/dF2l Z6ge2k6z65uEetPEP64w46rYgXRMjk3Xanm0pYQI8pkmdF3Sa5InqeRCfKehRBpIOK4VB2 HvXI/X0l1CfNjqWR/hA28wg0dKBrs4bqdSsqfPUtM5Z42BZHncQNco850gzT1FMuPQFyer AmJSRoc7risFFNV3qXuLBJ5wrZFAaef54brp4O7hd9liieyJhubSxQIN2OeRvp5+lgmNrn Pp1xsVtHzxRhCEC83bbMbojPXOCvrqbUNKHSJ+mx1RgCxVJyDReYDrydlY9hvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655022572; a=rsa-sha256; cv=none; b=t8EdnqBLQVkk4mMQkIyeVFthqneYMOdbZ2Uyhbbwej8zA+z+R78nu0wLpqbWLadOa3/qMU ttoOIL60U3FvjGm7CP18SjduyRmsgb5tRIcptgwfoZi5Z7SkD0g0ffx3pOfZjxiFb4z5Jl o7V4tDakATgS5k92Qvvghod+uvC3SrEUnvw5hIi1mfOmK0UR/dSFjY1vUi5nXKSWqlOS3+ vtK0MQOdNSbnUWX2ikXOgVt/qYv7Jsk0qNZSfGXKC4huRGAgLAggnXztJlGB5vHgUe+ca4 bkUSHKaS33EoIztns/1adcyooS48ckgN5GQ/DfYxcjk7oul5eDlNz8NUGmeoWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by crees: URL: https://cgit.FreeBSD.org/ports/commit/?id=34ece039879999c9eb41b4d9484ca51451b30fdf commit 34ece039879999c9eb41b4d9484ca51451b30fdf Author: Paul Armstrong AuthorDate: 2022-06-12 08:20:23 +0000 Commit: Chris Rees CommitDate: 2022-06-12 08:28:25 +0000 science/libtensorflow1: add flavour without AVX Not all processors bought these days support AVX, for example Pentium Gold. People would most likely wish to have a working package in this case. While here, remove march=native. PR: ports/260694 Discussed with: diizzy Discussed with: William Miur --- science/libtensorflow1/Makefile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/science/libtensorflow1/Makefile b/science/libtensorflow1/Makefile index fa459e4a2bef..e34701ead645 100644 --- a/science/libtensorflow1/Makefile +++ b/science/libtensorflow1/Makefile @@ -2,6 +2,7 @@ PORTNAME= libtensorflow1 DISTVERSIONPREFIX= v DISTVERSION= 1.15.5 DISTVERSIONSUFFIX= +PORTREVISION= 1 CATEGORIES= science MAINTAINER= freebsd-ports@otoh.org @@ -21,6 +22,13 @@ BUILD_DEPENDS= bash:shells/bash \ bazel:devel/bazel029 \ git:devel/git +FLAVORS= default noavx +FLAVOR?= ${FLAVORS:[1]} +noavx_PKGNAMESUFFIX= -noavx +noavx_CONFLICTS_INSTALL= libtensorflow1 +default_CONFLICTS_INSTALL= libtensorflow1-noavx +CONFLICTS_INSTALL= science/libtensorflow2 + USES= gmake python:3.7-3.9,build USE_GITHUB= yes @@ -69,8 +77,6 @@ GH_TUPLE= bazelbuild:rules_closure:308b05b2:bazelbuild_rules_closure \ USE_LDCONFIG= yes -CONFLICTS_INSTALL= science/libtensorflow2 - CC?= clang BINARY_ALIAS= python3=${PYTHON_CMD} python=${PYTHON_CMD} @@ -83,6 +89,11 @@ OPTIONS_DEFAULT= AVX OPTIONS_SINGLE= CPUFEATURE OPTIONS_SINGLE_CPUFEATURE= AVX AVX2 NOAVX +.if ${FLAVOR:U} == noavx +OPTIONS_EXCLUDE:= ${OPTIONS_SINGLE_CPUFEATURE} +.endif + +CPUFEATURE_DESC= Vector Processing Extensions NOAVX_DESC= Disable Advanced Vector Extensions AVX_DESC= Enable Advanced Vector Extensions (AVX) @@ -128,7 +139,7 @@ post-patch: do-configure: @cd ${WRKSRC} && ${SETENV} \ - CC_OPT_FLAGS="-I${LOCALBASE}/include -march=native -Wno-sign-compare" \ + CC_OPT_FLAGS="-I${LOCALBASE}/include" \ PREFIX="${LOCALBASE}" \ PYTHON_BIN_PATH=${PYTHON_CMD} \ PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \