always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,119 Commits 2 Branches 0 Tags
5eff2ed1bd24432c9fd577ee229b009da2c9a0ef
Commit Graph

261 Commits

Author SHA1 Message Date
Laurent Perron
ca579c649f add code samples in C++ for sat 2018-05-30 10:03:49 -07:00
Corentin Le Molgat
6cd8da56ce [CPP] Rework cc to use dynamic dependencies 
libortools:
- Rename LD_FLAGS to LDFLAGS
- Update LDFLAGS
- Add install_name to LDFLAGS on MacOS
- use OR_TOOLS_LIBS as target name

libraries:
- Rename OR_TOOLS_LD_FLAGS to OR_TOOLS_LDFLAGS
- Add OR_TOOLS_LNK and OR_TOOLS_LDFLAGS
- add install_name on MacOS

Misc:
- Rework LINK_FLAGS
- Replace ortools$Sgen by $(GEN_DIR)
- Fix install_cc rules
- Update detect_cc target
 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
02877e28f1 [UNIX][DEPS] Build dependencies as dynamic libs 
Unix:
- Rename install_directories rule
  this target creates dependencies/install dir not ortools install dir
- replace $(LIB_SUFFIX) by $L to be consistent with $E and $O suffix
- fix rpath, no need anymore patchelf
  -> remove prerequisite $(PATCHELF) in install_cc
- use build_cmake as build directory
  note: MacOS is case insensitive when creating directory
  and bazel file is named BUILD -> `mkdir build` won't work
- Fix CMD_LNK on mac
- Fix MacOS LINK_FLAGS
- MacOS also use LIB_DIR = lib

Win:
- Fix windows lib suffix $L

Protobuf:
- Need to use PROTOC (like MONO) to add LD_LIBRARY_PATH hack
  -> PROTOC = LD_LIBARY_PATH="..." protoc
  -> replace $(PROTOBUF_DIR)/bin/protoc by $(PROTOC)
- Remove uneeded PROTOBUF_DIR defs
- Apply patch to protobuf to use @rpath on MacOS
- Add rpath to protobuf install rules

Coin-OR
- Use coin-or github repos mirror instead of the svn repo (Fix #379)
- Use the splited Cbc (CoinUtils, Osi, Clp, Cgl, Cbc)
note: usually distro use this layout cf https://repology.org/metapackage/coin-or-cbc/badges
- Fix rpath for all coin-or libraries at post-install using patchelf (linux) or otools (osx)
 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
6b36617506 Makefile: Fix $S -> / in prerequisite 
$S is for Makefile shell cmd not target or prerequisite syntax.
i.e. always use / in path.
 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
3605506924 Fix help_cc on windows 
- typo tab instead of space
 2018-05-04 08:57:28 +02:00
Corentin Le Molgat
db17e75c48 Rework install_cc recipe 2018-04-26 17:59:03 +02:00
Corentin Le Molgat
88639db551 Makefile: Update detect_cc recipe 2018-04-26 17:59:03 +02:00
Corentin Le Molgat
8b34288ea0 Makefile.cpp: fix .PHONY 2018-04-26 17:59:03 +02:00
Corentin Le Molgat
61507da995 Add dynamic lib to OR_TOOLS_LNK 2018-04-26 17:59:03 +02:00
Corentin Le Molgat
8bba9eb62c Refactor build dirs Makefile management 2018-04-18 14:12:22 +02:00
Corentin Le Molgat
699ee5c088 Remove Flatzink bin/parser_main in clean_cc 2018-03-16 16:13:55 +01:00
Corentin Le Molgat
8f69f0b3aa Remove C++ examples in clean_cc 2018-03-16 16:13:55 +01:00
Corentin Le Molgat
1265d1d5b4 Fix clean_cc 
Still remains example binaries
 2018-03-16 16:13:55 +01:00
Corentin Le Molgat
11a22957a4 Fix echo blankline on windows 2018-03-06 15:03:40 +01:00
Corentin Le Molgat
9b41cae639 Update detect_* targets 2018-03-06 14:34:41 +01:00
Corentin Le Molgat
6eff7e4476 Add newline at end of each help_* targets 2018-03-06 14:23:47 +01:00
Laurent Perron
a4f4c2d5a6 move check_third_party into ortoolslib target; avoid rebuilding C# all the time 2018-03-06 11:42:06 +01:00
Corentin Le Molgat
8bfd7fb96e Add DEPENDENCIES_LNK to detect_cc 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
51b56430f5 Rework Makefile help 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
80e8676b21 Add detect_cc 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
32f5c8c52a Add help_cc target 2018-02-28 15:20:56 +01:00
Laurent Perron
b091adaf3f improve make clean* 2017-11-14 14:28:23 +01:00
Laurent Perron
e14ee86de3 move rcpsp parser to ortools/data; continue working on SAT 2017-11-07 15:45:52 +01:00
Laurent Perron
c8ff0ffc03 regenerate lex/yacc files 2017-09-08 13:20:30 +02:00
Laurent Perron
bada79303d clean objs/port/ 2017-08-02 14:22:23 -07:00
Laurent Perron
9c92556791 minor adjustments with internal code 2017-08-02 14:15:55 -07:00
Laurent Perron
4033496f0e fix compilation of fz 2017-07-01 10:26:01 +02:00
Laurent Perron
40ce0077f5 cp_model (sat) flatzinc solver 2017-05-29 14:49:34 +02:00
Laurent Perron
66b8d23079 move src to ortools; simplified python generation; remove some namespaces in the ortools/base helper files 2017-04-26 17:30:25 +02:00
Laurent Perron
c9b8b7b3e6 Fix routing deps 2017-04-09 21:56:47 +02:00
Laurent Perron
2cf3850457 remove dependency on flex/bison; store golden parser file in github 2017-03-31 09:58:07 +02:00
Driss Lahlou
9ab847c540 add cvrptw_with_breaks in archive 2017-01-26 21:39:17 +01:00
Driss Lahlou
66b017de36 add cvrptw_with_breaks 2017-01-26 21:22:42 +01:00
Driss Lahlou
8b1cc2e407 Refactoring of makefiles 2017-01-10 21:05:56 +01:00
Laurent Perron
5030a8a213 add 2 new sat based examples: shift_minimization, and rcpsp; port old examples to new API 2016-12-08 14:59:14 +01:00
Driss Lahlou
0e9d4ecec8 add frequency_assignment_problem to 'all' target 2016-11-02 19:12:40 +01:00
Driss Lahlou
c0589fe8f2 fixes in Makefiles concerning EX and ARGS 2016-10-06 12:08:29 +02:00
Laurent Perron
792c1358a5 Merge branch 'master' of https://github.com/google/or-tools 2016-10-05 14:15:20 +02:00
Laurent Perron
dce08dda1b more work on SAT to support CP constraints 2016-10-05 13:53:30 +02:00
Driss Lahlou
ba686e3f2f changes in running examples targets 2016-09-29 18:50:59 +02:00
Laurent Perron
08f556c520 more work on sat; initial connection to the flatzinc interpreter 2016-09-22 13:55:16 +02:00
Laurent Perron
cfafaf6d6e fix fz compilation 2016-09-21 22:24:46 +02:00
Laurent Perron
d827589aa8 major rewrite of the flatzinc code 2016-09-21 11:54:53 +02:00
Laurent Perron
922384cd57 fix makefile 2016-07-21 10:06:03 -07:00
Frédéric Rodrigo
871a683539 Fix include in Makefile.cpp.mk 2016-07-21 11:29:01 +02:00
Driss Lahlou
6c4deee178 fix some targets in makefile.cpp.mk 2016-07-20 14:16:06 +02:00
Driss Lahlou
8ff96a8d1d add to some targets in makefile.cpp.mk 2016-07-20 14:12:45 +02:00
Laurent Perron
3e158e7656 sat based scheduling: no_cycle, disjunctive, precedences + 2 examples: jobshop_sat and weighted_tardiness_sat 2016-07-19 14:19:21 -07:00
Laurent Perron
476c490176 use generated makefile part; port all other makefiles; remove files that were not compiled, and cannot be compiled 2016-07-19 13:14:43 -07:00
Laurent Perron
25e96b12d6 example of routing with disjoint time windows 2016-07-08 15:47:33 +02:00