From nobody Sun Jun 18 18:53:03 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 4QkhqM4V2bz4fGRK; Sun, 18 Jun 2023 18:53:03 +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 4QkhqM1z07z3L85; Sun, 18 Jun 2023 18:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687114383; 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=ZYBJOGUV50PBWtTw+q00uvvDogQWGt76Gt1NyU1vOjI=; b=HM4B8O3YMSksaZUzBq9IIFxnkqyjnjZa/c2cKcVqoojbhsvRcZeN2HalfKRyqh6LIMJPZQ cuB+N8xYtSkct1eVy0xZAeJ8j1E5KcQuH4fv+uTFP+ibB2QWSWRoDBje+tncs9EZT5gQu7 jnJ/Y6hLa1XhX5YspvXGeTdn8XWG6rEjtj2yfKo22fszTpTqlxnuZfQh6f5U3Xq7UUox2V KKQQezXc96zsSW63EzZc237PRJW/N37tM/AIOMQKRLPG+znNITRBgcrOtant6gLomtaeCu CqJQXYUsXJqy0Zm4riLgNamFpI5SLhSFrxISDRtFg6XPe7TtHCUL81bURp/xig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687114383; 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=ZYBJOGUV50PBWtTw+q00uvvDogQWGt76Gt1NyU1vOjI=; b=F6YPglLEHhJAY+XBwkPw5eu9+gsWJtp1V8xVZoYqlSoTrvsZd1AkgSyXTtqKy+bHsYqkEk tsv8fFkgNxCJKsBuvaIgriAZhIHpxordxeSZfsPpJMxsbLljO4GNRE4R3oJZVy3aGu0tpl fWhpgIBdV/d7ZXC3kv88CXS1OSIbXl/xpt9FeuHjzDBEPoVV3Emd8TlxMhyzzaU/llu/Im IRfpZc51LTaczlOUpFWxVX/7Fe8aRXZIvXhIuP0ykA1gOYWXBb7CeNdJeToFkSLK67Myud UpSLSQ4GwMWPpoRFMHVT63Ie/cByk6NJpZtlC85hYMyrjvZKiqBrAbOXRAL8lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687114383; a=rsa-sha256; cv=none; b=ltWmpApOVjzyToZpldH6BHTWSRtdkxdHP5/ooJ1vo9LZE1s8/ySjHHlvS2Qydu/OGNW9+i lD7p6rtBhw3waYF3UCUVrKFtwzg91HahM1KDVcZnliIYIjSPo7v7PvTKWmi3dRKOLedcD8 P+sIGEK27DNuPnK5iJkWSmhAgAmzsjC5tFL28GDglHc4Hg8b8H40MIQXWnB7ES3OulINzX uEGW5wNj/6tz/hJcVaXSoBMgqErHglot/MWXgSliKxVR5QDkr5mMFs+/vqV0XVIVZ7uE2A K0eVg6NJ5AEUE+vOBp16QLLJP3tWf296A9UNy1v1IzSoBaqKdva6N1uNtoJaoQ== 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 4QkhqM0nBGzmt7; Sun, 18 Jun 2023 18:53:03 +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 35IIr3nZ037406; Sun, 18 Jun 2023 18:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35IIr3Jb037405; Sun, 18 Jun 2023 18:53:03 GMT (envelope-from git) Date: Sun, 18 Jun 2023 18:53:03 GMT Message-Id: <202306181853.35IIr3Jb037405@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: fb1a3b688a47 - main - =?utf-8?Q?science/dwave-preprocessing:=20Update=200.4.0=20=E2=86=92=200.5.4?= 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: fb1a3b688a473e392317c80915fee5f01e3d392e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb1a3b688a473e392317c80915fee5f01e3d392e commit fb1a3b688a473e392317c80915fee5f01e3d392e Author: Yuri Victorovich AuthorDate: 2023-06-18 18:52:44 +0000 Commit: Yuri Victorovich CommitDate: 2023-06-18 18:52:44 +0000 science/dwave-preprocessing: Update 0.4.0 → 0.5.4 Reported by: portscout --- science/dwave-preprocessing/Makefile | 10 ++++-- science/dwave-preprocessing/distinfo | 6 ++-- ...ch-dwave_preprocessing_include_dwave_presolve.h | 11 +++++++ .../files/patch-testscpp_Makefile | 38 +++++++++++----------- .../patch-testscpp_tests_test__roof__duality.cpp | 4 +-- 5 files changed, 42 insertions(+), 27 deletions(-) diff --git a/science/dwave-preprocessing/Makefile b/science/dwave-preprocessing/Makefile index 193999807000..59b943e612d6 100644 --- a/science/dwave-preprocessing/Makefile +++ b/science/dwave-preprocessing/Makefile @@ -1,5 +1,5 @@ PORTNAME= dwave-preprocessing -DISTVERSION= 0.4.0 +DISTVERSION= 0.5.4 CATEGORIES= science # quantum-computing MAINTAINER= yuri@FreeBSD.org @@ -10,13 +10,17 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dimod>0:science/dimod -TEST_DEPENDS= catch>0:devel/catch +TEST_DEPENDS= catch>0:devel/catch \ + spdlog>0:devel/spdlog USES= compiler:c++11-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= dwavesystems +CXXFLAGS+= `pkg-config --cflags catch2 spdlog` +LDFLAGS+= `pkg-config --libs catch2 spdlog` + NO_BUILD= yes NO_ARCH= yes @@ -34,7 +38,7 @@ do-install: cd ${WRKSRC}/dwave/preprocessing/include && \ ${COPYTREE_SHARE} dwave-preprocessing ${STAGEDIR}${PREFIX}/include -do-test: +do-test: # tests fail to link, see https://github.com/dwavesystems/dwave-preprocessing/issues/119 @cd ${WRKSRC}/testscpp && ${SETENV} ${MAKE_ENV} ${MAKE} DIMOD="-I${LOCALBASE}/include" .include diff --git a/science/dwave-preprocessing/distinfo b/science/dwave-preprocessing/distinfo index a83055cb266e..3856873fccd3 100644 --- a/science/dwave-preprocessing/distinfo +++ b/science/dwave-preprocessing/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660494073 -SHA256 (dwavesystems-dwave-preprocessing-0.4.0_GH0.tar.gz) = 04ff8937b131af3520d4197f256c4ba68cad0783af131c57ce20083d3f36fad3 -SIZE (dwavesystems-dwave-preprocessing-0.4.0_GH0.tar.gz) = 80577 +TIMESTAMP = 1687113085 +SHA256 (dwavesystems-dwave-preprocessing-0.5.4_GH0.tar.gz) = 864ec18a8f14a83f0439d3cb6a9006c0d9577012f2cab14b622dc715bac17b24 +SIZE (dwavesystems-dwave-preprocessing-0.5.4_GH0.tar.gz) = 104138 diff --git a/science/dwave-preprocessing/files/patch-dwave_preprocessing_include_dwave_presolve.h b/science/dwave-preprocessing/files/patch-dwave_preprocessing_include_dwave_presolve.h new file mode 100644 index 000000000000..729aad02ae68 --- /dev/null +++ b/science/dwave-preprocessing/files/patch-dwave_preprocessing_include_dwave_presolve.h @@ -0,0 +1,11 @@ +--- dwave/preprocessing/include/dwave/presolve.h.orig 2023-06-18 18:36:53 UTC ++++ dwave/preprocessing/include/dwave/presolve.h +@@ -19,7 +19,7 @@ + #include + #include + +-#include "spdlog/spdlog.h" ++#include + #include "dimod/constrained_quadratic_model.h" + + namespace dwave { diff --git a/science/dwave-preprocessing/files/patch-testscpp_Makefile b/science/dwave-preprocessing/files/patch-testscpp_Makefile index 35530211b3d6..e8c4e6997413 100644 --- a/science/dwave-preprocessing/files/patch-testscpp_Makefile +++ b/science/dwave-preprocessing/files/patch-testscpp_Makefile @@ -1,32 +1,32 @@ ---- testscpp/Makefile.orig 2022-05-07 23:28:35 UTC +--- testscpp/Makefile.orig 2022-12-19 19:58:20 UTC +++ testscpp/Makefile -@@ -1,22 +1,22 @@ - ROOT := ../ +@@ -1,10 +1,10 @@ + ROOT := .. SRC := $(ROOT)/dwave/preprocessing/ + CATCH2 := $(ROOT)/testscpp/Catch2/single_include/ -DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())') +#DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())') + SPDLOG := $(ROOT)/extern/spdlog/include/ + INCLUDES := -I $(SRC)/include/ -I $(DIMOD) -I $(CATCH2) -I $(SPDLOG) +-FLAGS := -std=c++17 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Wno-deprecated-declarations -fcompare-debug-second -O3 ++FLAGS := ${CXXFLAGS} -std=c++17 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Wno-deprecated-declarations - all: catch2 test_main test_main_parallel tests tests_parallel + all: update test_main test_main_parallel tests tests_parallel --tests: test_main.out -+tests: test_main - ./test_main - --tests_parallel: test_main_parallel.out -+tests_parallel: test_main_parallel +@@ -15,12 +15,12 @@ tests_parallel: test_main_parallel.out ./test_main_parallel test_main: test_main.cpp -- g++ -std=c++11 -Wall -c test_main.cpp -- g++ -std=c++11 -Wall test_main.o tests/*.cpp -o test_main -I $(SRC)/include/ -I $(DIMOD) -+ ${CXX} `pkg-config --cflags catch2` -std=c++11 -Wall -c test_main.cpp -+ ${CXX} `pkg-config --cflags catch2` -std=c++11 -Wall test_main.o tests/*.cpp -o test_main -I $(SRC)/include/ -I $(DIMOD) +- g++ $(FLAGS) -c test_main.cpp +- g++ $(FLAGS) test_main.o tests/*.cpp -o test_main $(INCLUDES) ++ ${CXX} $(FLAGS) -c test_main.cpp ++ ${CXX} $(FLAGS) ${LDFLAGS} test_main.o tests/*.cpp -o test_main $(INCLUDES) test_main_parallel: test_main.cpp -- g++ -std=c++11 -fopenmp -Wall -c test_main.cpp -o test_main_parallel.o -- g++ -std=c++11 -fopenmp -Wall test_main_parallel.o tests/*.cpp -o test_main_parallel -I $(SRC)/include/ -I $(DIMOD) -+ ${CXX} `pkg-config --cflags catch2` -std=c++11 -fopenmp -Wall -c test_main.cpp -o test_main_parallel.o -+ ${CXX} `pkg-config --cflags catch2` -std=c++11 -fopenmp -Wall test_main_parallel.o tests/*.cpp -o test_main_parallel -I $(SRC)/include/ -I $(DIMOD) +- g++ $(FLAGS) -fopenmp -c test_main.cpp -o test_main_parallel.o +- g++ $(FLAGS) -fopenmp test_main_parallel.o tests/*.cpp -o test_main_parallel $(INCLUDES) ++ ${CXX} $(FLAGS) -fopenmp -c test_main.cpp -o test_main_parallel.o ++ ${CXX} $(FLAGS) ${LDFLAGS} -fopenmp test_main_parallel.o tests/*.cpp -o test_main_parallel $(INCLUDES) - catch2: + update: git submodule init diff --git a/science/dwave-preprocessing/files/patch-testscpp_tests_test__roof__duality.cpp b/science/dwave-preprocessing/files/patch-testscpp_tests_test__roof__duality.cpp index 01a4bff4b58c..e679ab3df1c0 100644 --- a/science/dwave-preprocessing/files/patch-testscpp_tests_test__roof__duality.cpp +++ b/science/dwave-preprocessing/files/patch-testscpp_tests_test__roof__duality.cpp @@ -1,10 +1,10 @@ ---- testscpp/tests/test_roof_duality.cpp.orig 2022-08-28 01:26:12 UTC +--- testscpp/tests/test_roof_duality.cpp.orig 2022-12-19 19:58:20 UTC +++ testscpp/tests/test_roof_duality.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. --#include "../Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include #include