Commit graph

48 commits

Author SHA1 Message Date
Jan Beich
4129c8b61d math/ceres-solver: builds fine with python3.6
https://github.com/ceres-solver/ceres-solver/commit/2ad14b7a616c
2019-09-28 17:18:52 +00:00
Jan Beich
8c039a25be Drop verbose flag for CTest after r444324
ninja: error: unknown target 'ARGS=-V'
2019-09-27 17:25:50 +00:00
Ganael LAPLANCHE
03166a4b36 Update devel/tbb to 2019.8 and bump dependent ports' revisions
Changelog: https://github.com/intel/tbb/blob/tbb_2019/CHANGES
2019-09-25 10:03:49 +00:00
Gerald Pfeifer
ea8c8ec7da Bump PORTREVISION for ports depending on the canonical version of GCC
as defined in Mk/bsd.default-versions.mk which has moved from GCC 8.3
to GCC 9.1 under most circumstances now after revision 507371.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
   c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, everything INDEX-11 shows with a dependency on lang/gcc9 now.

PR:		238330
2019-07-26 20:46:53 +00:00
Jan Beich
9ccb836090 math/ceres-solver: don't force GCC for OpenMP on -CURRENT
Limited to amd64 and i386. LLVM openmp doesn't support other
architectures on FreeBSD (unlike Linux) but it's only important where
Clang is default e.g., aarch64, armv6, armv7.
2019-04-22 17:38:04 +00:00
Jan Beich
6df9e8ff12 math/ceres-solver: drop GCC RPATH after r499061
USES=fortran was used to ensure linking against libceres picks up
correct libgcc_s to satisfy dependencies e.g., suitesparse, *blas.
2019-04-22 17:37:56 +00:00
Gerald Pfeifer
879e75a659 Related to revision 499061 bump ports with USES=fortran to have them
benefit from the improved situation where libgcc_s is only used when
absolutely necessary.

Suggested by:	tijl
2019-04-22 13:16:33 +00:00
Tobias C. Berner
8a4ab05d84 Update math/eigen3 to 3.3.7
- http://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.3.6
- http://eigen.tuxfamily.org/index.php?title=ChangeLog#Eigen_3.3.7
2018-12-26 09:06:34 +00:00
Tobias C. Berner
707c6bf295 Change cmake default behaviour to outsource.
Ports that build out of source now simply can use "USES=cmake"
instead of "USES=cmake:outsource". Ports that fail to build
out of source now need to specify "USES=cmake:insource".

I tried to only set insource where explictely needed.

PR:		232038
Exp-run by:	antoine
2018-12-25 20:25:39 +00:00
Gerald Pfeifer
a9f015d155 Bump PORTREVISION for ports depending on the canonical version of GCC
defined via Mk/bsd.default-versions.mk which has moved from GCC 7.4 t
GCC 8.2 under most circumstances.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c11, c++0x, c++11-lang,
   c++11-lib, c++14-lang, c++17-lang, or gcc-c++11-lib
plus, as a double check, everything INDEX-11 showed depending on lang/gcc7.

PR:		231590
2018-12-12 01:35:33 +00:00
Ganael LAPLANCHE
e20bbea618 Update devel/tbb to version 2019.1 and bump dependent ports' revisions
Also, reintegrate HTML documentation that was removed in previous version.
2018-10-11 14:47:13 +00:00
Ganael LAPLANCHE
c05d3b7d2f Update devel/tbb to version 2019 and bump dependent port's revisions 2018-10-04 10:03:59 +00:00
Jan Beich
34f500b59a math/ceres-solver: rebuild after r476182
$ make -C graphics/colmap
[...]
-- Found installed version of Eigen: /usr/local/share/eigen3/cmake
CMake Error at /usr/local/lib/cmake/Ceres/CeresConfig.cmake:88 (message):
  Failed to find Ceres - Found Eigen dependency, but the version of Eigen
  found (3.3.5) does not exactly match the version of Eigen Ceres was
  compiled with (3.3.4).  This can cause subtle bugs by triggering violations
  of the One Definition Rule.  See the Wikipedia article
  http://en.wikipedia.org/wiki/One_Definition_Rule for more details
Call Stack (most recent call first):
  /usr/local/lib/cmake/Ceres/CeresConfig.cmake:223 (ceres_report_not_found)
  CMakeLists.txt:72 (find_package)

Reported by:	pkg-fallout
2018-08-05 17:34:56 +00:00
Gerald Pfeifer
09f9633cb6 Bump PORTREVISION for ports depending on the canonical version of GCC
in the ports tree (via Mk/bsd.default-versions.mk and lang/gcc) which
has now moved from GCC 6 to GCC 7 by default.

This includes ports
 - featuring USE_GCC=yes or USE_GCC=any,
 - featuring USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and those
 - with USES=compiler specifying one of openmp, nestedfct, c11, c++0x,
   c++11-lib, c++11-lang, c++14-lang, c++17-lang, or gcc-c++11-lib.

PR:		222542
2018-07-29 22:18:44 +00:00
Jan Beich
d430b32312 math/ceres-solver: unbreak TBB=on (r470052 didn't help)
In file included from internal/ceres/block_random_access_dense_matrix.cc:31:
In file included from internal/ceres/block_random_access_dense_matrix.h:34:
In file included from internal/ceres/block_random_access_matrix.h:36:
In file included from internal/ceres/mutex.h:98:
include/ceres/internal/port.h:56:4: error: One of CERES_USE_OPENMP, CERES_USE_TBB,CERES_USE_CXX11_THREADS or CERES_NO_THREADS must be defined.
 #  error One of CERES_USE_OPENMP, CERES_USE_TBB,CERES_USE_CXX11_THREADS or CERES_NO_THREADS must be defined.
    ^

Pointy hat to:	jbeich
2018-05-15 20:54:02 +00:00
Jan Beich
6551dfcc43 math/ceres-solver: unbreak ATLAS=on after r465553
When math/suitesparse has OPENBLAS=on:
-- Found BLAS: /usr/local/lib/libopenblas.so
-- Found LAPACK library: alapack
[...]
 0x0000000000000001 NEEDED               Shared library: [libalapack.so.2]
 0x0000000000000001 NEEDED               Shared library: [libopenblas.so.0]

When math/suitesparse has ATLAS=on:
-- Found BLAS: /usr/local/lib/libf77blas.so;/usr/local/lib/libatlas.so
-- Found LAPACK library: alapack
[...]
//usr/local/lib/libalapack.so.2: undefined reference to `cblas_izamax'
//usr/local/lib/libalapack.so.2: undefined reference to `cblas_sswap'
c++: error: linker command failed with exit code 1 (use -v to see invocation)

Pointy hat to:	jbeich
2018-05-15 20:43:10 +00:00
Jan Beich
dbecfded77 math/ceres-solver: document r465553 rationale 2018-05-15 20:42:51 +00:00
Jan Beich
81ed61088d math/ceres-solver: unbreak OPENBLAS=on after r465553
-- Found BLAS: /usr/local/lib/libopenblas.so
-- Did not find LAPACK library, disabling LAPACK support.

Pointy hat to:	jbeich
2018-05-15 20:42:31 +00:00
Jan Beich
1096be95fb math/ceres-solver: unbreak TBB=on
Determining if the include file pthread.h exists failed with the following output:
Change Dir: /wrkdirs/usr/ports/math/ceres-solver/work/.build/CMakeFiles/CMakeTmp

Run Build Command:"/usr/bin/make" "cmTC_b9506/fast"
/usr/bin/make -f CMakeFiles/cmTC_b9506.dir/build.make CMakeFiles/cmTC_b9506.dir/build
Building C object CMakeFiles/cmTC_b9506.dir/CheckIncludeFile.c.o
/usr/bin/cc   -O2 -pipe  -fstack-protector -isystem /usr/local/include -fno-strict-aliasing -O2 -pipe -fstack-protector -isystem /usr/local/include -fno-strict-aliasing  -isystem /usr/local/include -std=c++11 -o CMakeFiles/cmTC_b9506.dir/CheckIncludeFile.c.o   -c /wrkdirs/usr/ports/math/ceres-solver/work/.build/CMakeFiles/CMakeTmp/CheckIncludeFile.c
error: invalid argument '-std=c++11' not allowed with 'C/ObjC'
*** Error code 1
2018-05-15 20:42:11 +00:00
Jan Beich
a67144205f math/ceres-solver: unbreak NETLIB=on by backing out r465552
-- Found BLAS: /usr/local/lib/libopenblas.so
-- Found LAPACK library: /usr/local/lib/libopenblas.so;/usr/local/lib/libopenblas.so

Pointy hat to:	jbeich
2018-05-15 20:41:52 +00:00
Yuri Victorovich
61818ce94b math/suitesparse: Update 4.0.2 -> 5.2.0
Port changes:
* Change to DISTVERSION
* Update MASTER_SITES
* Change to LICENSE_COMB=dual
* Add LIB_DEPENDS
* Unbundle metis, made it a dependency
* Update do-build and do-install
* Update WWW

Bump 11 ports.
games/naev is marked broken because it depends on the no longer installed library.

PR:		210579
Submitted by:	yuri
Submitted by:	pfg
Approved by:	maintainer timeout (maho@FreeBSD.org, 21 months)
Approved by:	maintainer timeout (fortran@FreeBSD.org, 45 days)
2018-04-26 06:41:30 +00:00
Jan Beich
1f842fbdbb math/ceres-solver: unbreak OPENMP=off after r465555
$ make config
│ │──────────────────────────── Threading support ───────────────────────────│ │
│ │+( ) OPENMP       Parallel processing support via OpenMP                  │ │
│ │+(*) TBB          Intel threading building blocks                         │ │
====> You cannot select multiple options from the THREADS radio
=====> Only one of these must be defined: OPENMP TBB
Config is invalid. Re-edit? [Y/n] y
2018-04-15 23:57:29 +00:00
Jan Beich
487d872a5f math/ceres-solver: update to 1.14.0
Changes:	http://ceres-solver.org/version_history.html
2018-03-26 01:05:20 +00:00
Jan Beich
c3776ede08 math/ceres-solver: prefer OpenBLAS by default 2018-03-26 01:05:06 +00:00
Jan Beich
6f09a0a838 math/ceres-solver: don't use libs from USES=blaslapack
According to Ceres installation documentation:

 ... one needs to be careful to turn off the threading inside OpenBLAS
 as it conflicts with use of threads in Ceres.

math/openblas exposes single-threaded (USE_THREAD=0) version as -lopenblas
while multi-threaded (NUM_THREADS=8) version as -lopenblasp (p suffix).
2018-03-26 01:04:51 +00:00
Jan Beich
d11d667b0e math/ceres-solver: request BLAS flavor via environment
https://github.com/ceres-solver/ceres-solver/issues/355
2018-03-26 01:03:29 +00:00
Gerald Pfeifer
c2a92a1aea Bump PORTREVISIONs of all users of math/mpc that we just updated to
version 1.1.0 (via revision 464079).
2018-03-10 17:46:04 +00:00
Tobias C. Berner
51d04637cb New USES=eigen
Usage:
    USES=eigen:<version>[,<type>]

    version: 2 or 3 (required)
    type:    build (default), run

  For example:
    USES=eigen:2,build,run
  will add a BUILD- and RUN_DEPENDS on math/eigen2, and
    USES=eigen:3
  will add a BUILD_DEPENDS on math/eigen3.

* Convert the existing ports to use it
  - biology/iqtree: remove run time dependency (seemed not to be needed)
  - graphics/movit: remove run time dependency (seemed not to be needed)
  - science/avogadro: add run time dependeny (installed cmake file requires it to be present)

Reviewed by:	rakuco, mat
Differential Revision:	https://reviews.freebsd.org/D13702
2018-01-02 16:49:24 +00:00
Jan Beich
9d1dc2407c Improve CMake style in my ports
- Convert to CMAKE_{ON,OFF} helpers
- Convert to _CMAKE_BOOL option helpers
- android-file-transfer: Share _CMAKE_BOOL via _IMPLIES
- Annotate types
2018-01-01 13:42:54 +00:00
Mathieu Arnold
551be3c723 Convert Python ports to FLAVORS.
Ports using USE_PYTHON=distutils are now flavored.  They will
  automatically get flavors (py27, py34, py35, py36) depending on what
  versions they support.

  There is also a USE_PYTHON=flavors for ports that do not use distutils
  but need FLAVORS to be set.  A USE_PYTHON=noflavors can be set if
  using distutils but flavors are not wanted.

  A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been
  added to cope with Python ports that did not have the Python
  PKGNAMEPREFIX but are flavored.

  USES=python now also exports a PY_FLAVOR variable that contains the
  current python flavor.  It can be used in dependency lines when the
  port itself is not python flavored.  For example, deskutils/calibre.

  By default, all the flavors are generated.  To only generate flavors
  for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define
  BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf.

  In all the ports with Python dependencies, the *_DEPENDS entries MUST
  end with the flavor so that the framework knows which to build/use.
  This is done by appending '@${PY_FLAVOR}' after the origin (or
  @${FLAVOR} if in a Python module with Python flavors, as the content
  will be the same).  For example:

    RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}

PR:		223071
Reviewed by:	portmgr, python
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D12464
2017-11-30 15:50:30 +00:00
Gerald Pfeifer
e59c88cece Bump PORTREVISION for ports depending on the canonical version of GCC
(via Mk/bsd.default-versions.mk and lang/gcc) which has moved from
GCC 5.4 to GCC 6.4 under most circumstances.

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using Mk/bsd.octave.mk which in turn features USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c++11-lib, c++11-lang,
   c++14-lang, c++0x, c11, or gcc-c++11-lib.

PR:		219275
2017-09-10 20:55:38 +00:00
Jan Beich
1f793c32c5 math/ceres-solver: pacify portlint after r447891 2017-08-13 14:25:27 +00:00
Jan Beich
6fdd439894 math/ceres-solver: update to 1.13.0
Changes:	http://ceres-solver.org/version_history.html
2017-08-13 14:24:08 +00:00
Gerald Pfeifer
04d6f52202 Bump PORTREVISIONs for ports depending on the canonical version of GCC and
lang/gcc which have moved from GCC 4.9.4 to GCC 5.4 (at least under some
circumstances such as versions of FreeBSD or platforms).

This includes ports
 - with USE_GCC=yes or USE_GCC=any,
 - with USES=fortran,
 - using using Mk/bsd.octave.mk which in turn has USES=fortran, and
 - with USES=compiler specifying openmp, nestedfct, c++11-lib, c++14-lang,
   c++11-lang, c++0x, c11, or gcc-c++11-lib.

PR:		216707
2017-04-01 15:23:30 +00:00
Jan Beich
857289785e lang/gcc: clear BROKEN from consumers as 10.1 is past EOL
PR:		214863
2017-01-03 08:44:59 +00:00
Dmitry Marakasov
dcd3a41a9d - Mark BROKEN on FreeBSD 10.1
Approved by:	portmgr blanket
2016-12-21 15:56:58 +00:00
Jan Beich
13d07760cf Switch USES=compiler:gcc-c++11-lib to use base libc++ on 10.2+ systems
PR:		215192
Requested by:	dim
Exp-run by:	antoine
Approved by:	antoine
2016-12-16 05:08:09 +00:00
Gerald Pfeifer
e4b7b9118a Bump PORTREVISIONS for ports depending on the canonical version of GCC and
lang/gcc which have moved from GCC 4.8.5 to GCC 4.9.4 (at least under some
circumstances such as versions of FreeBSD or platforms), part II.

The first part covered  ports with USE_GCC=yes, USE_GCC=any, or one of
gcc-c++11-lib, openmp, nestedfct, c++11-lib as well as c++14-lang,
c++11-lang, c++0x, c11 requested via USES=compiler.

This adds ports with USES=fortran and ports using Mk/bsd.octave.mk
which in turn has USES=fortran.

PR:		214965
Reported by:	thierry
2016-12-07 13:24:56 +00:00
Jan Beich
e5f65e3147 math/ceres-solver: update to 1.12.0
Changes:	https://github.com/ceres-solver/ceres-solver/compare/1.12.0rc4...1.12.0
2016-12-06 22:53:54 +00:00
Jan Beich
822b1ea775 math/ceres-solver: update to 1.12.0.r4
Changes:	https://github.com/ceres-solver/ceres-solver/compare/c5c6f55...1.12.0rc4
2016-11-23 12:47:48 +00:00
Gerald Pfeifer
89f8b05214 Bump PORTREVISIONS for ports depending on the canonical version of GCC and
lang/gcc which have moved from GCC 4.8.5 to GCC 4.9.4 (at least under some
circumstances such as versions of FreeBSD or platforms).

In particular that is ports with USE_GCC=yes, USE_GCC=any, or one of
gcc-c++11-lib, openmp, nestedfct, c++11-lib as well as c++14-lang,
c++11-lang, c++0x, c11 requested via USES=compiler.
2016-11-20 09:38:08 +00:00
Jan Beich
ffa7fe1a48 math/ceres-solver: update to 1.12.0.r2.3
Changes:	https://github.com/ceres-solver/ceres-solver/compare/1.12.0rc1...c5c6f55
2016-11-13 12:44:25 +00:00
Jan Beich
8ac482a5bf math/ceres-solver: unbreak OPENMP=off on 10.0+ i386
In file included from examples/helloworld.cc:36:
In file included from include/ceres/ceres.h:37:
In file included from include/ceres/autodiff_cost_function.h:132:
In file included from include/ceres/internal/autodiff.h:145:
include/ceres/jet.h:246:3: error: requested alignment is less than minimum alignment of 4 for type 'Eigen::Matrix<double, 1, 1, kAlignHint>'
  alignas(kAlignment) Eigen::Matrix<T, N, 1, kAlignHint> v;
  ^
include/ceres/internal/autodiff.h:232:34: note: in instantiation of template class 'ceres::Jet<double, 1>' requested here
    FixedArray<JetT, (256 * 7) / sizeof(JetT)> x(
                                 ^
include/ceres/autodiff_cost_function.h:211:53: note: in instantiation of member function 'ceres::internal::AutoDiff<CostFunctor, double, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0>::Differentiate' requested here
           N0, N1, N2, N3, N4, N5, N6, N7, N8, N9>::Differentiate(
                                                    ^
examples/helloworld.cc:70:11: note: in instantiation of member function 'ceres::AutoDiffCostFunction<CostFunctor, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0>::Evaluate' requested here
      new AutoDiffCostFunction<CostFunctor, 1, 1>(new CostFunctor);
          ^

Tested by:	cmp before.o after.o # GCC 4.8 / 6.2
2016-11-08 03:54:30 +00:00
Jan Beich
e67dc162af Adjust TEST_WRKSRC for USES=[cq]make:outsource
Approved by:	rakuco
Differential Revision:	https://reviews.freebsd.org/D8274
2016-10-18 11:20:01 +00:00
Jan Beich
b1c4e8a724 math/ceres-solver: disable EIGENSPARSE by default like upstream
During configure stage the following

   ===============================================================
   Enabling the use of Eigen as a sparse linear algebra library
   for solving the nonlinear least squares problems. Enabling
   this option results in an LGPL licensed version of
   Ceres Solver as the Simplicial Cholesky factorization in Eigen
   is licensed under the LGPL.
   ===============================================================

turns into

   ===============================================================
   Disabling the use of Eigen as a sparse linear algebra library.
   This does not affect the covariance estimation algorithm
   which can still use the EIGEN_SPARSE_QR algorithm.
   ===============================================================
2016-10-16 17:00:02 +00:00
Jan Beich
5868580f35 math/ceres-solver: minor sorting nit 2016-10-16 00:15:07 +00:00
Jan Beich
aa965d6182 math/ceres-solver: oops, fix a typo 2016-10-16 00:03:35 +00:00
Jan Beich
291729b42a math/ceres-solver: add new port
Based on:	Gentoo (1.11.0 ebuild)
Tested on:	graphics/openmvg from @outpaddling's repo (build on 10.3 amd64)

Ceres Solver is an open source C++ library for modeling and solving
large, complicated optimization problems. It is a feature rich, mature
and performant library which has been used in production at Google
since 2010. Ceres Solver can solve two kinds of problems.

1. Non-linear Least Squares problems with bounds constraints.
2. General unconstrained optimization problems.

http://ceres-solver.org/
2016-10-15 23:53:45 +00:00