Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

Commit 47c43b4b authored by Laurent Belcour's avatar Laurent Belcour
Browse files

[CI] Updating Travis and AppVeyor to better handle CERES

parent 8ca3ad94
...@@ -53,7 +53,7 @@ build_script: ...@@ -53,7 +53,7 @@ build_script:
- cd ceres-solver - cd ceres-solver
- mkdir build-ceres - mkdir build-ceres
- cd build-ceres - cd build-ceres
- cmake .. -DBUILD_SHARED_LIBS=ON -DMINIGLOG=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX="..\..\build" -DEIGEN_INCLUDE_DIR="..\..\build\include" -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" - cmake .. -DBUILD_SHARED_LIBS=OFF -DMINIGLOG=ON -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DCMAKE_INSTALL_PREFIX="..\..\build" -DEIGEN_INCLUDE_DIR="..\..\build\include" -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles"
- nmake /NOLOGO install - nmake /NOLOGO install
- cd ..\..\.. - cd ..\..\..
...@@ -64,7 +64,7 @@ build_script: ...@@ -64,7 +64,7 @@ build_script:
) else ( ) else (
mkdir build & mkdir build &
cd build & cd build &
cmake .. -DEIGEN3_INCLUDE_DIR="external/build/include/eigen3" -DCeres_DIR="..\external\build\CMake" -Wdev -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" & cmake .. -DEIGEN3_INCLUDE_DIR="external/build/include/eigen3" -DCeres_DIR="external/build/CMake" -Wdev -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" &
nmake /NOLOGO & nmake /NOLOGO &
cd .. cd ..
) )
......
...@@ -15,8 +15,9 @@ addons: ...@@ -15,8 +15,9 @@ addons:
packages: packages:
- g++-6 - g++-6
- cmake - cmake
- libboost-python-dev
- libeigen3-dev - libeigen3-dev
- libceres-dev
- libpython3-dev
before_install: before_install:
- OMP_NUM_THREADS=2 - OMP_NUM_THREADS=2
......
...@@ -287,6 +287,7 @@ bool nonlinear_fitter_nlopt::fit_data(const ptr<data>& d, ptr<function>& fit, co ...@@ -287,6 +287,7 @@ bool nonlinear_fitter_nlopt::fit_data(const ptr<data>& d, ptr<function>& fit, co
// Launch minimization // Launch minimization
double f_end; double f_end;
std::cout << p << std::endl;
res = nlopt_optimize(opt, &p[0], &f_end); res = nlopt_optimize(opt, &p[0], &f_end);
if(res > 0) if(res > 0)
......
...@@ -69,7 +69,7 @@ int main(int argc, char** argv) ...@@ -69,7 +69,7 @@ int main(int argc, char** argv)
arguments args(argc, argv) ; arguments args(argc, argv) ;
#ifdef __GLIBC__ #ifdef __GLIBC__
feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_INVALID); // feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_INVALID);
#endif #endif
if(args.is_defined("help")) { if(args.is_defined("help")) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment