simplify various CMakeMake-based easyblocks by enhancing CMakeMake (w.r.t. CMAKE_BUILD_TYPE, shared vs static libs, fPIC) #1929

Flamefire · 2020-01-16T09:24:31Z

This now contains (is rebased on) #1921

I worked on some more parameters in the CMakeMake EB.

out of source builds: separate_build_dir gets now set by EasyBlocks that require it
fPIC: Honor toolchainopts
new EasyConfig parameter build_shared_libs to unify existing practice
build_type honors toolchainopts (defaults to Release)

See individual commits

easybuild/easyblocks/generic/cmakemake.py

easybuild/easyblocks/d/dolfin.py

easybuild/easyblocks/b/blender.py

akesandgren · 2020-02-14T14:54:38Z

easybuild/easyblocks/d/dolfin.py

+    def extra_options():
+        extra_vars = CMakePythonPackage.extra_options()
+        extra_vars['separate_build_dir'][0] = True
+        extra_vars['build_type'][0] = 'Release'


Same here, if toolchainopts has debug True, should probably be Debug

I'd actually solve this in the cmakemake block: when it is none (default) then use either release or debug depending on the toolchainopt
This would be a change to current behavior where it is not currently set, but imo is the right thing as it is the equivalent of what is done for other build systems. See #911 for discussion on defaulting to release

Yes, doing this in cmakemake is clearly the "right" thing to do.

Note though that for dolfin you changed it from the previous Debug to Release
Although that one is kind of wrong anyway...

If you are ok I'd change that in the cmakemake eb so release will become the default effectively. I'd prefer that very much

In this case this is correct as the debug was unintended: #1920

Flamefire

The setting of build_type depending on toolchainopts is now done in the CMakeMake EB and this line has been removed

easybuild/easyblocks/b/blender.py

Flamefire · 2020-02-28T15:04:46Z

I rebased this and included the very related PR #1921, which I now closed. The final result should now be complete and ready to go.

…Make based EBs Some explicit settings are taken from easybuilders#616 and enhanced after testing with forced out-of-source build for all ECs using CMake but excluding ones using the Intel compiler Other did specify separate_build_dir in the configure step which makes EB show the wrong default value

If the build_type is not set explicitely, check toolchainopts[debug] and use either 'Debug' or 'Release'. The influence of 'Release' is rather minor as optarch is always used which is probably set to some optimization level already and hence overwrites the CMake-set optimization level. It still is a good and reasonable default similar to e.g. ConfigureMake

…ocks to ensure --module-only still works on existing installations

… up to CMakeMake

…hat should be skipped

…ts yet (by the easyconfig file)

…ter) in LAMMPS easyblock if it's not specified in configopts yet

boegel

@Flamefire see also Flamefire#2

easybuild/easyblocks/c/clang.py

easybuild/easyblocks/d/dolfin.py

easybuild/easyblocks/e/elsi.py

easybuild/easyblocks/generic/cmakemake.py

easybuild/easyblocks/l/lammps.py

easybuild/easyblocks/o/opencv.py

easybuild/easyblocks/s/superlu.py

…ts in CMakeMake easyblock

fixes for CMakeMake and CMakeMake-based easyblocks (ELSI, SuperLU, Clang, DOLFIN, LAMMPS)

easybuild/easyblocks/generic/cmakemake.py

easybuild/easyblocks/l/lammps.py

boegel · 2020-03-31T18:42:41Z

Did extensive review & testing on top of this (actually on top of #1933), couldn't find any more issues or breaking changes, so merging this...

Thanks a lot for your efforts on this @Flamefire!

houndci-bot reviewed Jan 16, 2020

View reviewed changes

easybuild/easyblocks/generic/cmakemake.py Outdated Show resolved Hide resolved

easybuild/easyblocks/d/dolfin.py Outdated Show resolved Hide resolved

Flamefire force-pushed the cmake_build_folder branch from e32d14f to 847bb56 Compare January 16, 2020 09:35

This was referenced Jan 16, 2020

enable out of tree build by default in CMakeMake easyblock #1933

Merged

Default out of tree build for CMakeMake #616

Closed

akesandgren reviewed Feb 14, 2020

View reviewed changes

easybuild/easyblocks/b/blender.py Outdated Show resolved Hide resolved

akesandgren reviewed Feb 14, 2020

View reviewed changes

Flamefire commented Feb 27, 2020

View reviewed changes

easybuild/easyblocks/b/blender.py Outdated Show resolved Hide resolved

Flamefire force-pushed the cmake_build_folder branch 2 times, most recently from 0e6e148 to a8db458 Compare February 28, 2020 14:35

Flamefire mentioned this pull request Feb 28, 2020

change various easyblock deriving from CMakeMake to use 'build_type' easyconfig parameter #1921

Closed

Flamefire force-pushed the cmake_build_folder branch from a8db458 to 8931d5a Compare February 28, 2020 15:02

Flamefire added 3 commits March 17, 2020 09:36

Use CMakeMakes new buildtype property in other EBs

7289d42

[CMake] Honor pic in toolchainopts

930b409

Flamefire force-pushed the cmake_build_folder branch from 8931d5a to 2907090 Compare March 17, 2020 08:36

Flamefire added 4 commits March 17, 2020 10:11

[CMake] Add build_shared_libs option

16ecc27

[Dolfin] Remove superflous setting of compiler done in CMake EB

e690596

Make use of the new default for build_type in CMakeMake

97ef461

Flamefire force-pushed the cmake_build_folder branch from 2907090 to 97ef461 Compare March 17, 2020 09:12

boegel added this to the release after 4.2.0 (4.2.1?) milestone Mar 29, 2020

boegel added change code cleanup labels Mar 29, 2020

boegel added 5 commits March 30, 2020 12:01

set self.lib_ext in CMakeMake constructor + fix ELSI & SuperLU easybl…

5c5ec8c

…ocks to ensure --module-only still works on existing installations

don't hard set build_type to 'Release' in Clang easyblock, leave that…

da2ff2c

… up to CMakeMake

don't use 'if False' in DOLFIN easyblock, just comment out the code t…

46abdac

…hat should be skipped

only let CMakeMake set -DCMAKE_BUILD_TYPE if it's not set in configop…

3d342e8

…ts yet (by the easyconfig file)

only set -DBUILD_SHARED_LIBS (via build_shared_libs easyconfig parame…

411ae72

…ter) in LAMMPS easyblock if it's not specified in configopts yet

boegel mentioned this pull request Mar 30, 2020

fixes for CMakeMake and CMakeMake-based easyblocks (ELSI, SuperLU, Clang, DOLFIN, LAMMPS) Flamefire/easybuild-easyblocks#2

Merged

boegel requested changes Mar 30, 2020

View reviewed changes

boegel and others added 6 commits March 30, 2020 14:45

remove debug print in ELSI easyblock

8437552

use stricter pattern for checking for -DCMAKE_BUILD_TYPE= in configop…

0543481

…ts in CMakeMake easyblock

use stricter patterns for -DDBUILD_SHARED_LIBS= in LAMMPS easyblock

462e557

fix enabling build_shared_libs by default in ELSI easyblock

2dee8a6

Merge pull request #2 from boegel/cmake_build_folder

5cb5cce

fixes for CMakeMake and CMakeMake-based easyblocks (ELSI, SuperLU, Clang, DOLFIN, LAMMPS)

Add warning if CMAKE_BUILD_TYPE and build_type is set

c69df05

boegel mentioned this pull request Mar 30, 2020

fix deprecation of 'shared_libs' easyconfig parameter in Trilinos easyblock Flamefire/easybuild-easyblocks#3

Merged

boegel reviewed Mar 30, 2020

View reviewed changes

easybuild/easyblocks/generic/cmakemake.py Show resolved Hide resolved

easybuild/easyblocks/generic/cmakemake.py Outdated Show resolved Hide resolved

easybuild/easyblocks/l/lammps.py Show resolved Hide resolved

Flamefire force-pushed the cmake_build_folder branch from 8887196 to dc05bb8 Compare March 30, 2020 15:24

Flamefire added 5 commits March 30, 2020 17:29

Warn about BUILD_SHARED_LIBS and build_shared_libs being both set

d608b64

[Clang] Set build type for stage N>0

8d170cc

[Lammps] Use correct default for separate_build_dir

949e0dd

[OpenBabel] remove empty newline after method

777eb2e

[Trilinos] Set build_shared_libs in ctor

d8efcc5

Flamefire force-pushed the cmake_build_folder branch from dc05bb8 to 94bfad6 Compare March 30, 2020 15:29

Make lib_ext a property of CMakeMake

f4df495

Flamefire force-pushed the cmake_build_folder branch from 94bfad6 to f4df495 Compare March 30, 2020 16:06

boegel approved these changes Mar 30, 2020

View reviewed changes

boegel changed the title ~~Simplify various CMake EasyBlocks~~ simplify various CMakeMake-based easyblocks by enhancing CMakeMake (w.r.t. CMAKE_BUILD_TYPE, shared vs static libs, fPIC) Mar 31, 2020

boegel modified the milestones: release after 4.2.0 (4.2.1?), next release (4.2.0) Mar 31, 2020

boegel merged commit 713e5d9 into easybuilders:develop Mar 31, 2020

Flamefire deleted the cmake_build_folder branch April 1, 2020 07:15

branfosj mentioned this pull request Sep 10, 2023

CMake: do release build by default #911

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

simplify various CMakeMake-based easyblocks by enhancing CMakeMake (w.r.t. CMAKE_BUILD_TYPE, shared vs static libs, fPIC) #1929

simplify various CMakeMake-based easyblocks by enhancing CMakeMake (w.r.t. CMAKE_BUILD_TYPE, shared vs static libs, fPIC) #1929

Flamefire commented Jan 16, 2020 •

edited

Loading

akesandgren Feb 14, 2020

Flamefire Feb 14, 2020

akesandgren Feb 14, 2020

Flamefire Feb 14, 2020

Flamefire left a comment

Flamefire commented Feb 28, 2020

boegel left a comment

boegel commented Mar 31, 2020

simplify various CMakeMake-based easyblocks by enhancing CMakeMake (w.r.t. CMAKE_BUILD_TYPE, shared vs static libs, fPIC) #1929

simplify various CMakeMake-based easyblocks by enhancing CMakeMake (w.r.t. CMAKE_BUILD_TYPE, shared vs static libs, fPIC) #1929

Conversation

Flamefire commented Jan 16, 2020 • edited Loading

akesandgren Feb 14, 2020

Choose a reason for hiding this comment

Flamefire Feb 14, 2020

Choose a reason for hiding this comment

akesandgren Feb 14, 2020

Choose a reason for hiding this comment

Flamefire Feb 14, 2020

Choose a reason for hiding this comment

Flamefire left a comment

Choose a reason for hiding this comment

Flamefire commented Feb 28, 2020

boegel left a comment

Choose a reason for hiding this comment

boegel commented Mar 31, 2020

Flamefire commented Jan 16, 2020 •

edited

Loading