CMake build definitions #1624

jackgerrits · 2018-10-10T21:39:28Z

This PR add CMake build definitions. They do not include clr or csharp, but they do build on Windows and Linux. This attempt has gone down the route of as small a change as possible but still a step in the right direction.

Items still left to be done:

Fixes #1635

jackgerrits · 2018-10-12T21:24:21Z

I've updated the PR with the install step properly working now including:

Replacing values in the pkgconfig files
Generating both static and shared libs
Installing headers, libs and binaries
Offering options similar to those in the automake configure
Include headers for IDE generators
Replace package version in config.h file
NOTE: I am not generating or placing .la files like automake did, I am not sure if they are important

I am not sure how to determine if this brings us to automake parity but after running make install the outputs are of almost the same structure (see .la note above).

More testing is needed, but we are getting close to replacing 2 build systems with this change.

- Add cmake support for Java and Python - Rewrite most of Python setup file for CMake

JohnLangford · 2018-10-26T20:52:10Z

This pull request introduces 9 alerts when merging c0d19cb into a18d3ab - view on LGTM.com

new alerts:

6 for Unused import
1 for Unused local variable
1 for Module is imported with 'import' and 'import from'
1 for Variable defined multiple times

Comment posted by LGTM.com

JohnLangford · 2018-10-27T16:51:50Z

This pull request introduces 9 alerts when merging 437a1e1 into a18d3ab - view on LGTM.com

new alerts:

6 for Unused import
1 for Unused local variable
1 for Module is imported with 'import' and 'import from'
1 for Variable defined multiple times

Comment posted by LGTM.com

…finding

JohnLangford · 2018-10-30T15:09:27Z

This pull request introduces 6 alerts when merging 79b2887 into a18d3ab - view on LGTM.com

new alerts:

2 for Local variable hides global variable
1 for Unused import
1 for No virtual destructor
1 for Comparison result is always the same
1 for Short global name

Comment posted by LGTM.com

JohnLangford · 2018-10-30T16:36:47Z

Issues:

Build doesn't seem to understand the number of processors.
Add targets for profiling, valgrind, static.
remove ffast-math from valgrind profile (fixing an inconsistency)
Fix static compile
Make it so install headers are automatically headers
Do we need disambiguators for else() in the vowpalwabbit directory?

JohnLangford · 2018-10-30T16:45:42Z

java/CMakeLists.txt

@@ -0,0 +1,55 @@
+find_package(JNI)


@jmorra @deaktator can you look at the cmake build for java here?

JohnLangford · 2018-10-30T16:46:31Z

python/CMakeLists.txt

@@ -0,0 +1,36 @@
+if(NOT DEFINED PY_VERSION)


@Scott-Graham-Bose This is the relevant bit for python build changes.

JohnLangford · 2018-10-30T16:47:06Z

test/CMakeLists.txt

@@ -0,0 +1,53 @@
+add_subdirectory(unit_test)


@arielf These are the change to invocation of tests.

JohnLangford · 2018-10-30T17:52:18Z

@eisber you may also be interested in this patch.

eisber · 2018-10-30T18:05:11Z

I already skipped through ☺ Thanks

jackgerrits · 2018-10-30T19:56:57Z

Disambiguators for else are not needed, they are used by CMake to warn if if-endifs do not match

jackgerrits · 2018-10-30T20:08:55Z

@JohnLangford I believe I have resolved the issues we came across today

JohnLangford · 2018-10-30T20:50:32Z

This pull request introduces 6 alerts when merging 8c1013e into 05cca52 - view on LGTM.com

new alerts:

2 for Local variable hides global variable
1 for Unused import
1 for No virtual destructor
1 for Comparison result is always the same
1 for Short global name

Comment posted by LGTM.com

JohnLangford · 2018-10-31T18:14:03Z

This pull request introduces 6 alerts when merging 8537b54 into f11d323 - view on LGTM.com

new alerts:

2 for Local variable hides global variable
1 for Unused import
1 for No virtual destructor
1 for Comparison result is always the same
1 for Short global name

Comment posted by LGTM.com

JohnLangford · 2018-11-01T14:11:15Z

This pull request introduces 6 alerts when merging 8537b54 into ad60f86 - view on LGTM.com

new alerts:

2 for Local variable hides global variable
1 for Unused import
1 for No virtual destructor
1 for Comparison result is always the same
1 for Short global name

Comment posted by LGTM.com

JohnLangford · 2018-11-01T16:06:19Z

This pull request introduces 3 alerts when merging 7d1e2ff into 1ea72b2 - view on LGTM.com

new alerts:

1 for Local variable hides global variable
1 for Comparison result is always the same
1 for Short global name

Comment posted by LGTM.com

JohnLangford · 2018-11-02T18:11:42Z

This pull request introduces 3 alerts when merging 163c58f into acd910e - view on LGTM.com

new alerts:

1 for Local variable hides global variable
1 for Comparison result is always the same
1 for Short global name

Comment posted by LGTM.com

JohnLangford · 2018-11-03T17:57:29Z

This pull request introduces 3 alerts when merging f9554f4 into 72f6f43 - view on LGTM.com

new alerts:

1 for Local variable hides global variable
1 for Comparison result is always the same
1 for Short global name

Comment posted by LGTM.com

JohnLangford · 2018-11-05T14:57:11Z

This pull request introduces 3 alerts when merging 75ee3d0 into fb8d488 - view on LGTM.com

new alerts:

1 for Local variable hides global variable
1 for Comparison result is always the same
1 for Short global name

Comment posted by LGTM.com

jackgerrits and others added 13 commits October 4, 2018 08:57

WIP cmake files

fe260da

Cmake changes

2d23a3b

WIP changes

44f1660

Add doc makefile

cda9682

Tests are building and running

114c1c7

Add help2man, fix install

248465f

Fix build issue for vwdll

dce30e0

Get Windows cmake build working, fix debug/release configurations

9a9a6bf

Fix quotes

21c8393

Merge branch 'master' into jagerrit/cmake_vw

79f4806

Install now works similar to automake, pkgconfig changes for cmake

75797a5

Fix test issue

cde2c57

Add warnings option

63bb64a

jackgerrits and others added 10 commits October 12, 2018 17:24

Merge branch 'master' into jagerrit/cmake_vw

6490ccf

Add TODO and update comment

38c100e

Simplify targets

ca52f2f

Convert tests to proper cmake test targets:

36394e9

Remove all code references to automake

7e09405

Fix versioning workflow across windows and linux

d881a9e

Add install for java to cmake, fix version parsing

e625159

- Update build linux script for cmake

cc82b2a

- Add cmake support for Java and Python - Rewrite most of Python setup file for CMake

Remove makefiles

88e4313

Don't make Java required

c0d19cb

Update org name in readme, add vw-bin to test deps

437a1e1

jackgerrits added 3 commits October 27, 2018 13:18

Fix Python version selection for package build, fix test PATH for vw …

11ab71c

…finding

Test if earlier cmake version works

0c0956a

Upgrade cmake in build

189d718

JohnLangford reviewed Oct 30, 2018

View reviewed changes

java/CMakeLists.txt

@@ -0,0 +1,55 @@

find_package(JNI)

Copy link

Member

JohnLangford Oct 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmorra @deaktator can you look at the cmake build for java here?

JohnLangford reviewed Oct 30, 2018

View reviewed changes

test/CMakeLists.txt

@@ -0,0 +1,53 @@

add_subdirectory(unit_test)

Copy link

Member

JohnLangford Oct 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arielf These are the change to invocation of tests.

jackgerrits and others added 2 commits October 30, 2018 16:08

Fix static linking, makefile targets

aab0f03

Merge branch 'master' into jagerrit/cmake_vw

8c1013e

Merge branch 'master' into jagerrit/cmake_vw

8537b54

This was referenced Nov 1, 2018

Add CMake build system #1419

Closed

Marcozo/cmake clean #1526

Closed

jackgerrits added 4 commits November 1, 2018 11:02

Fix some lgtm issues

ddae88e

Merge branch 'master' into jagerrit/cmake_vw

bca5036

Can turn test target on or off

7823513

Fix source dir variable for explore

7d1e2ff

Merge branch 'master' into jagerrit/cmake_vw

163c58f

Merge branch 'master' into jagerrit/cmake_vw

f9554f4

Merge branch 'master' into jagerrit/cmake_vw

75ee3d0

lokitoth merged commit 2a8f497 into VowpalWabbit:master Nov 5, 2018

jackgerrits deleted the jagerrit/cmake_vw branch January 15, 2019 18:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CMake build definitions #1624

CMake build definitions #1624

jackgerrits commented Oct 10, 2018 •

edited

Loading

jackgerrits commented Oct 12, 2018

JohnLangford commented Oct 26, 2018

JohnLangford commented Oct 27, 2018

JohnLangford commented Oct 30, 2018

JohnLangford commented Oct 30, 2018

JohnLangford Oct 30, 2018

JohnLangford Oct 30, 2018

JohnLangford Oct 30, 2018

JohnLangford commented Oct 30, 2018

eisber commented Oct 30, 2018 via email

jackgerrits commented Oct 30, 2018

jackgerrits commented Oct 30, 2018

JohnLangford commented Oct 30, 2018

JohnLangford commented Oct 31, 2018

JohnLangford commented Nov 1, 2018

JohnLangford commented Nov 1, 2018

JohnLangford commented Nov 2, 2018

JohnLangford commented Nov 3, 2018

JohnLangford commented Nov 5, 2018

CMake build definitions #1624

CMake build definitions #1624

Conversation

jackgerrits commented Oct 10, 2018 • edited Loading

jackgerrits commented Oct 12, 2018

JohnLangford commented Oct 26, 2018

JohnLangford commented Oct 27, 2018

JohnLangford commented Oct 30, 2018

JohnLangford commented Oct 30, 2018

JohnLangford Oct 30, 2018

Choose a reason for hiding this comment

JohnLangford Oct 30, 2018

Choose a reason for hiding this comment

JohnLangford Oct 30, 2018

Choose a reason for hiding this comment

JohnLangford commented Oct 30, 2018

eisber commented Oct 30, 2018 via email

jackgerrits commented Oct 30, 2018

jackgerrits commented Oct 30, 2018

JohnLangford commented Oct 30, 2018

JohnLangford commented Oct 31, 2018

JohnLangford commented Nov 1, 2018

JohnLangford commented Nov 1, 2018

JohnLangford commented Nov 2, 2018

JohnLangford commented Nov 3, 2018

JohnLangford commented Nov 5, 2018

jackgerrits commented Oct 10, 2018 •

edited

Loading