Date: Sat, 11 Oct 2025 12:14:04 +0200 From: Daniel Engberg <diizzy@FreeBSD.org> To: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= <fernando.apesteguia@gmail.com>, Yuri Victorovich <yuri@freebsd.org> Cc: "ports-committers@FreeBSD.org" <ports-committers@freebsd.org>, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 6996da7c3428 - main - =?utf-8?Q?math/cimod: update 1.6.2 =E2=86=92 1.7.3; Make tests run; Improve pkg-des= Message-ID: <fb132b6c-fa6f-4744-ade1-085b7f1c24f0@FreeBSD.org> In-Reply-To: <CAGwOe2aqH3ZGdf21OdFvme3Fex0VbonmAgF_Ksn5%2BhzkFs6VKA@mail.gmail.com> References: <202510110930.59B9UTxc049748@gitrepo.freebsd.org> <CAGwOe2aqH3ZGdf21OdFvme3Fex0VbonmAgF_Ksn5%2BhzkFs6VKA@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On 2025-10-11 11:52, Fernando Apesteguía wrote: > > > El sáb, 11 oct 2025, 11:30, Yuri Victorovich <yuri@freebsd.org> escribió: > > cr?= > 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: 6996da7c342889e15fbdc7819b830ff8de82affa > Auto-Submitted: auto-generated > > > Hi Yuri, > > What does that auto-generated mean? > > > > The branch main has been updated by yuri: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=6996da7c342889e15fbdc7819b830ff8de82affa > <https://cgit.FreeBSD.org/ports/commit/?id=6996da7c342889e15fbdc7819b830ff8de82affa>; > > commit 6996da7c342889e15fbdc7819b830ff8de82affa > Author: Yuri Victorovich <yuri@FreeBSD.org> > AuthorDate: 2025-10-11 09:29:20 +0000 > Commit: Yuri Victorovich <yuri@FreeBSD.org> > CommitDate: 2025-10-11 09:30:24 +0000 > > math/cimod: update 1.6.2 → 1.7.3; Make tests run; Improve > pkg-descr > > > This commit message is a bit off I think. One thing is the commit > title and other the description. Probably after the first ';' > everything should be in the body of the message, IMO. > > --- > math/cimod/Makefile | 9 +++-- > math/cimod/distinfo | 6 +-- > math/cimod/files/patch-external_googletest.cmake | 47 > ++++++++++++++++++++++++ > math/cimod/pkg-descr | 9 ++++- > 4 files changed, 64 insertions(+), 7 deletions(-) > > diff --git a/math/cimod/Makefile b/math/cimod/Makefile > index da6b482a1457..811099f57455 100644 > --- a/math/cimod/Makefile > +++ b/math/cimod/Makefile > @@ -1,11 +1,12 @@ > PORTNAME= cimod > DISTVERSIONPREFIX= v > -DISTVERSION= 1.6.2 > +DISTVERSION= 1.7.3 > CATEGORIES= math > > MAINTAINER= yuri@FreeBSD.org > COMMENT= C++ header-only library for a binary quadratic models > -WWW= https://github.com/OpenJij/cimod > +WWW= https://www.openjij.org/ \ > + https://github.com/Jij-Inc/cimod > > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > @@ -17,7 +18,7 @@ TEST_DEPENDS= googletest>0:devel/googletest > USES= cmake:testing compiler:c++17-lang eigen:3,build,run > > USE_GITHUB= yes > -GH_ACCOUNT= OpenJij > +GH_ACCOUNT= Jij-Inc > > CMAKE_ON= CIMOD_INSTALL # doesn't do anything, see > https://github.com/OpenJij/cimod/issues/103 > CMAKE_OFF= CIMOD_TEST CIMOD_DOCS > @@ -28,4 +29,6 @@ NO_ARCH= yes > do-install: # see https://github.com/OpenJij/cimod/issues/103 > cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} > ${STAGEDIR}${PREFIX}/include > > +# tests as of 1.7.3: 100% tests passed, 0 tests failed out of 79 > + > .include <bsd.port.mk <http://bsd.port.mk>>; > diff --git a/math/cimod/distinfo b/math/cimod/distinfo > index e344c4bc92de..785fc5b72f5c 100644 > --- a/math/cimod/distinfo > +++ b/math/cimod/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1709938110 > -SHA256 (OpenJij-cimod-v1.6.2_GH0.tar.gz) = > 732c10f68d90c9292b411c1148cf0be54b0fb812ec4aa4ba1102514486113ae1 > -SIZE (OpenJij-cimod-v1.6.2_GH0.tar.gz) = 139864 > +TIMESTAMP = 1760174868 > +SHA256 (Jij-Inc-cimod-v1.7.3_GH0.tar.gz) = > 066fe6187124da8a7ee250c060bce883828ae33f6e38a3525f72c71a6de44510 > +SIZE (Jij-Inc-cimod-v1.7.3_GH0.tar.gz) = 341035 > diff --git a/math/cimod/files/patch-external_googletest.cmake > b/math/cimod/files/patch-external_googletest.cmake > new file mode 100644 > index 000000000000..4a37cdd349ff > --- /dev/null > +++ b/math/cimod/files/patch-external_googletest.cmake > @@ -0,0 +1,47 @@ > +--- external/googletest.cmake.orig 2025-01-27 12:00:00 UTC > ++++ external/googletest.cmake > +@@ -14,38 +14,11 @@ > + > + include(FetchContent) > + > +-message(CHECK_START "Fetching GoogleTest") > +-list(APPEND CMAKE_MESSAGE_INDENT " ") > +- > +-set(CMAKE_CXX_STANDARD 17) > +-set(FETCHCONTENT_QUIET OFF) > +- > +-#### Google test #### > +-FetchContent_Declare( > +- googletest > +- GIT_REPOSITORY https://github.com/google/googletest > +- GIT_TAG v1.17.0 > +- GIT_SHALLOW TRUE > +-) > +- > +-if(WIN32) > +- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) > +-endif() > +- > +-# Prevent googletest from being installed by using > FetchContent_Populate + add_subdirectory with EXCLUDE_FROM_ALL > +-FetchContent_GetProperties(googletest) > +-if(NOT googletest_POPULATED) > +- FetchContent_Populate(googletest) > +- add_subdirectory(${googletest_SOURCE_DIR} > ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL) > +-endif() > +- > ++# Try to find pre-installed GoogleTest first > + find_package(GTest) > + > +-#FetchContent_GetProperties(googletest) > +- > +-#message(STATUS "gtest_SOURCE_DIR = ${gtest_SOURCE_DIR}") > +-#message(STATUS "gmock_SOURCE_DIR = ${gmock_SOURCE_DIR}") > +- > +- > +-list(POP_BACK CMAKE_MESSAGE_INDENT) > +-message(CHECK_PASS "fetched") > ++if(NOT GTest_FOUND) > ++ message(FATAL_ERROR "GoogleTest not found. Please install > googletest package.") > ++else() > ++ message(STATUS "Found pre-installed GoogleTest") > ++endif() > diff --git a/math/cimod/pkg-descr b/math/cimod/pkg-descr > index f588a9340f2f..eb48d39c4b1e 100644 > --- a/math/cimod/pkg-descr > +++ b/math/cimod/pkg-descr > @@ -1 +1,8 @@ > -cmod is a C++ library for a binary quadratic model. > +Cimod is a C++ header-only library for a binary quadratic model > (BQM), > +which is a model of variables that can be in one of two states (0 > or 1, > +or -1 or 1). BQMs are used to represent a wide range of optimization > +problems, and are particularly important in the context of quantum > +annealing and other heuristic optimization algorithms. > + > +This library provides tools to create and manipulate BQM instances, > +making it easier to work with these models in C++ applications. > Hi Yuri, Did you use any tools for this desc as it doesn't seem to match upstream's documentation? Best regards, Daniel [-- Attachment #2 --] <!DOCTYPE html> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body> <div class="moz-cite-prefix">On 2025-10-11 11:52, Fernando Apesteguía wrote:<br> </div> <blockquote type="cite" cite="mid:CAGwOe2aqH3ZGdf21OdFvme3Fex0VbonmAgF_Ksn5+hzkFs6VKA@mail.gmail.com"> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <div dir="auto"> <div><br> <br> <div class="gmail_quote gmail_quote_container"> <div dir="ltr" class="gmail_attr">El sáb, 11 oct 2025, 11:30, Yuri Victorovich <<a href="mailto:yuri@freebsd.org" moz-do-not-send="true" class="moz-txt-link-freetext">yuri@freebsd.org</a>> escribió:<br> </div> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">cr?=<br> MIME-Version: 1.0<br> Content-Type: text/plain; charset=utf-8<br> Content-Transfer-Encoding: 8bit<br> X-Git-Committer: yuri<br> X-Git-Repository: ports<br> X-Git-Refname: refs/heads/main<br> X-Git-Reftype: branch<br> X-Git-Commit: 6996da7c342889e15fbdc7819b830ff8de82affa<br> Auto-Submitted: auto-generated<br> </blockquote> </div> </div> <div dir="auto"><br> </div> <div dir="auto">Hi Yuri,</div> <div dir="auto"><br> </div> <div dir="auto">What does that auto-generated mean?</div> <div dir="auto"><br> </div> <div dir="auto"><br> </div> <div dir="auto"> <div class="gmail_quote gmail_quote_container"> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> <br> The branch main has been updated by yuri:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=6996da7c342889e15fbdc7819b830ff8de82affa" rel="noreferrer noreferrer" target="_blank" moz-do-not-send="true">https://cgit.FreeBSD.org/ports/commit/?id=6996da7c342889e15fbdc7819b830ff8de82affa</a><br>; <br> commit 6996da7c342889e15fbdc7819b830ff8de82affa<br> Author: Yuri Victorovich <a class="moz-txt-link-rfc2396E" href="mailto:yuri@FreeBSD.org"><yuri@FreeBSD.org></a><br> AuthorDate: 2025-10-11 09:29:20 +0000<br> Commit: Yuri Victorovich <a class="moz-txt-link-rfc2396E" href="mailto:yuri@FreeBSD.org"><yuri@FreeBSD.org></a><br> CommitDate: 2025-10-11 09:30:24 +0000<br> <br> math/cimod: update 1.6.2 → 1.7.3; Make tests run; Improve pkg-descr<br> </blockquote> </div> </div> <div dir="auto"><br> </div> <div dir="auto">This commit message is a bit off I think. One thing is the commit title and other the description. Probably after the first ';' everything should be in the body of the message, IMO.</div> <div dir="auto"><br> </div> <div dir="auto"> <div class="gmail_quote gmail_quote_container"> <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> ---<br> math/cimod/Makefile | 9 +++--<br> math/cimod/distinfo | 6 +--<br> math/cimod/files/patch-external_googletest.cmake | 47 ++++++++++++++++++++++++<br> math/cimod/pkg-descr | 9 ++++-<br> 4 files changed, 64 insertions(+), 7 deletions(-)<br> <br> diff --git a/math/cimod/Makefile b/math/cimod/Makefile<br> index da6b482a1457..811099f57455 100644<br> --- a/math/cimod/Makefile<br> +++ b/math/cimod/Makefile<br> @@ -1,11 +1,12 @@<br> PORTNAME= cimod<br> DISTVERSIONPREFIX= v<br> -DISTVERSION= 1.6.2<br> +DISTVERSION= 1.7.3<br> CATEGORIES= math<br> <br> MAINTAINER= <a class="moz-txt-link-abbreviated" href="mailto:yuri@FreeBSD.org">yuri@FreeBSD.org</a><br> COMMENT= C++ header-only library for a binary quadratic models<br> -WWW= <a href="https://github.com/OpenJij/cimod" rel="noreferrer noreferrer" target="_blank" moz-do-not-send="true" class="moz-txt-link-freetext">https://github.com/OpenJij/cimod</a><br>; +WWW= <a href="https://www.openjij.org/" rel="noreferrer noreferrer" target="_blank" moz-do-not-send="true" class="moz-txt-link-freetext">https://www.openjij.org/</a>; \<br> + <a href="https://github.com/Jij-Inc/cimod" rel="noreferrer noreferrer" target="_blank" moz-do-not-send="true" class="moz-txt-link-freetext">https://github.com/Jij-Inc/cimod</a><br>; <br> LICENSE= MIT<br> LICENSE_FILE= ${WRKSRC}/LICENSE<br> @@ -17,7 +18,7 @@ TEST_DEPENDS= googletest>0:devel/googletest<br> USES= cmake:testing compiler:c++17-lang eigen:3,build,run<br> <br> USE_GITHUB= yes<br> -GH_ACCOUNT= OpenJij<br> +GH_ACCOUNT= Jij-Inc<br> <br> CMAKE_ON= CIMOD_INSTALL # doesn't do anything, see <a href="https://github.com/OpenJij/cimod/issues/103" rel="noreferrer noreferrer" target="_blank" moz-do-not-send="true" class="moz-txt-link-freetext">https://github.com/OpenJij/cimod/issues/103</a><br>; CMAKE_OFF= CIMOD_TEST CIMOD_DOCS<br> @@ -28,4 +29,6 @@ NO_ARCH= yes<br> do-install: # see <a href="https://github.com/OpenJij/cimod/issues/103" rel="noreferrer noreferrer" target="_blank" moz-do-not-send="true" class="moz-txt-link-freetext">https://github.com/OpenJij/cimod/issues/103</a><br>; cd ${WRKSRC}/include && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/include<br> <br> +# tests as of 1.7.3: 100% tests passed, 0 tests failed out of 79<br> +<br> .include <<a href="http://bsd.port.mk" rel="noreferrer noreferrer" target="_blank" moz-do-not-send="true">bsd.port.mk</a>><br> diff --git a/math/cimod/distinfo b/math/cimod/distinfo<br> index e344c4bc92de..785fc5b72f5c 100644<br> --- a/math/cimod/distinfo<br> +++ b/math/cimod/distinfo<br> @@ -1,3 +1,3 @@<br> -TIMESTAMP = 1709938110<br> -SHA256 (OpenJij-cimod-v1.6.2_GH0.tar.gz) = 732c10f68d90c9292b411c1148cf0be54b0fb812ec4aa4ba1102514486113ae1<br> -SIZE (OpenJij-cimod-v1.6.2_GH0.tar.gz) = 139864<br> +TIMESTAMP = 1760174868<br> +SHA256 (Jij-Inc-cimod-v1.7.3_GH0.tar.gz) = 066fe6187124da8a7ee250c060bce883828ae33f6e38a3525f72c71a6de44510<br> +SIZE (Jij-Inc-cimod-v1.7.3_GH0.tar.gz) = 341035<br> diff --git a/math/cimod/files/patch-external_googletest.cmake b/math/cimod/files/patch-external_googletest.cmake<br> new file mode 100644<br> index 000000000000..4a37cdd349ff<br> --- /dev/null<br> +++ b/math/cimod/files/patch-external_googletest.cmake<br> @@ -0,0 +1,47 @@<br> +--- external/googletest.cmake.orig 2025-01-27 12:00:00 UTC<br> ++++ external/googletest.cmake<br> +@@ -14,38 +14,11 @@<br> + <br> + include(FetchContent)<br> + <br> +-message(CHECK_START "Fetching GoogleTest")<br> +-list(APPEND CMAKE_MESSAGE_INDENT " ")<br> +-<br> +-set(CMAKE_CXX_STANDARD 17)<br> +-set(FETCHCONTENT_QUIET OFF)<br> +-<br> +-#### Google test ####<br> +-FetchContent_Declare(<br> +- googletest<br> +- GIT_REPOSITORY <a href="https://github.com/google/googletest" rel="noreferrer noreferrer" target="_blank" moz-do-not-send="true" class="moz-txt-link-freetext">https://github.com/google/googletest</a><br>; +- GIT_TAG v1.17.0<br> +- GIT_SHALLOW TRUE<br> +-)<br> +-<br> +-if(WIN32)<br> +- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)<br> +-endif()<br> +-<br> +-# Prevent googletest from being installed by using FetchContent_Populate + add_subdirectory with EXCLUDE_FROM_ALL<br> +-FetchContent_GetProperties(googletest)<br> +-if(NOT googletest_POPULATED)<br> +- FetchContent_Populate(googletest)<br> +- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR} EXCLUDE_FROM_ALL)<br> +-endif()<br> +-<br> ++# Try to find pre-installed GoogleTest first<br> + find_package(GTest)<br> + <br> +-#FetchContent_GetProperties(googletest)<br> +-<br> +-#message(STATUS "gtest_SOURCE_DIR = ${gtest_SOURCE_DIR}")<br> +-#message(STATUS "gmock_SOURCE_DIR = ${gmock_SOURCE_DIR}")<br> +-<br> +-<br> +-list(POP_BACK CMAKE_MESSAGE_INDENT)<br> +-message(CHECK_PASS "fetched")<br> ++if(NOT GTest_FOUND)<br> ++ message(FATAL_ERROR "GoogleTest not found. Please install googletest package.")<br> ++else()<br> ++ message(STATUS "Found pre-installed GoogleTest")<br> ++endif()<br> diff --git a/math/cimod/pkg-descr b/math/cimod/pkg-descr<br> index f588a9340f2f..eb48d39c4b1e 100644<br> --- a/math/cimod/pkg-descr<br> +++ b/math/cimod/pkg-descr<br> @@ -1 +1,8 @@<br> -cmod is a C++ library for a binary quadratic model.<br> +Cimod is a C++ header-only library for a binary quadratic model (BQM),<br> +which is a model of variables that can be in one of two states (0 or 1,<br> +or -1 or 1). BQMs are used to represent a wide range of optimization<br> +problems, and are particularly important in the context of quantum<br> +annealing and other heuristic optimization algorithms.<br> +<br> +This library provides tools to create and manipulate BQM instances,<br> +making it easier to work with these models in C++ applications.<br> </blockquote> </div> </div> </div> </blockquote> <br> Hi Yuri,<br> <br> Did you use any tools for this desc as it doesn't seem to match upstream's documentation?<br> <br> Best regards,<br> Daniel </body> </html>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?fb132b6c-fa6f-4744-ade1-085b7f1c24f0>