cmake install fixes #2596

dschwoerer · 2022-10-04T12:49:33Z

Installs ~~boutcore~~ boutpp

Resolves one of the points of: #2321

We guess the location, but it can be changed with -DCMAKE_INSTALL_PYTHON_SITEARCH

running `make all install` in manual folder no builds and installs the html manual

Skip unit test if gtest is not available

CMakeLists.txt

ZedThree

LGTM, thanks @dschwoerer !

dschwoerer · 2022-10-14T08:49:11Z

rpath is broken, so still WIP

requires a wrapper around libboutcore

It still ignore the python version, and uses what ever python version cmake can find. `py.310 -m build` and `py.311 -m build` give the same results. `-C` flags can be used to tell cmake to use a given python version.

removesuffix is only python3.9+

otherwise the error is lost as only the last exit code is checked

The python zip implementation doesn't support them, so we end up with broken symlinks and thus unloadable libaries.

dschwoerer · 2022-10-19T08:33:24Z

Should be working now 👍

Unlike before the cython library is not directly imported, but a wrapper imports everything (except symbols starting with _)

Default is to use local versioning

dschwoerer · 2022-10-19T08:48:45Z

Nice to have:

pip install boutpp
module use $(python -c 'import site; print(site.getusersitepackages())')/boutpp/share/module
module load bout++/python

Should this be split into several PRs?
Renaming as part of the PR was potentially a bad idea, I worry that rebasing will lead to many conflicts 🙈

ZedThree

Using a custom backend is very clever and really nice! I have a few suggestions, and it could do with some docstrings.

Could pyproject.toml have the project metadata too, or does the backend handle all that?

I suspect this will need conflicts fixing after the boutpp numpy PR goes in.

Also, the black workflow is broken: https://github.com/boutproject/BOUT-dev/actions/runs/3377858435/jobs/5607304385#step:5:39
So that will need double-checking

CMakeLists.txt

tools/pylib/_boutpp_build/backend.py

.github/workflows/black-fix.yml

ZedThree · 2022-11-02T14:14:45Z

Oh dear, #2589 and this PR both renamed a bunch of files. I had a quick go, but @dschwoerer you're probably going to have to deal with this, I'm afraid!

@ZedThree

* use module-level caching * Add docs on what to update on release * use re.sub for substitution Thanks @ZedThree for the comments

@ZedThree

* Use more appropriate python libraries (mkdir, run2) * Add doc-strings * Remove commented out code Thanks @ZedThree for the comments

dschwoerer

Thanks for the feedback 👍

CMakeLists.txt

tools/pylib/_boutpp_build/backend.py

dschwoerer · 2022-11-03T10:03:09Z

Using a custom backend is very clever and really nice! I have a few suggestions, and it could do with some docstrings.

Could pyproject.toml have the project metadata too, or does the backend handle all that?

It could, but then it needs to be parsed + reformatted and printed. Might be easier to add it directly. But more metadata is one of the missing things.

I suspect this will need conflicts fixing after the boutpp numpy PR goes in.

Yes. Should be fixed now.

Also, the black workflow is broken: https://github.com/boutproject/BOUT-dev/actions/runs/3377858435/jobs/5607304385#step:5:39 So that will need double-checking

black seems to be fixed. The ! did the job :-)

Otherwise the extension suffix needs to be known.

ZedThree · 2022-11-03T11:54:50Z

Some tests failing like:

  File "/home/runner/work/BOUT-dev/BOUT-dev/build/tests/MMS/bracket/runtest", line 17, in <module>
    import boutpp as bc
ValueError: source code string cannot contain null bytes

https://github.com/boutproject/BOUT-dev/actions/runs/3385119775/jobs/5622897973#step:9:823

dschwoerer added 6 commits October 2, 2022 14:12

Do not install sym link

8bf98f6

Install python packages

6661f91

We guess the location, but it can be changed with -DCMAKE_INSTALL_PYTHON_SITEARCH

Check for jinja2 for python interface

043403c

simplify installation of manuals

2984f0e

running `make all install` in manual folder no builds and installs the html manual

handle missing gtest gracefully

0986358

Skip unit test if gtest is not available

add make dist

6eba0bb

ZedThree reviewed Oct 13, 2022

View reviewed changes

CMakeLists.txt Outdated Show resolved Hide resolved

ZedThree requested changes Oct 13, 2022

View reviewed changes

dschwoerer and others added 21 commits October 17, 2022 14:24

build i18n/l10n files with cmake

8c58f12

Exclude some additionatl commands

6cc025c

Fix rpath by installing boutcoure as a library

1b73c97

requires a wrapper around libboutcore

Add PEP517 / PEP518 compliaent backend

c01ea0e

It still ignore the python version, and uses what ever python version cmake can find. `py.310 -m build` and `py.311 -m build` give the same results. `-C` flags can be used to tell cmake to use a given python version.

Apply black changes

6fc89c4

Remove debug print statements

91ceea4

workaround for old python

d4421f7

removesuffix is only python3.9+

Fixes for pip install of sdist

a52b565

Rename boutcore to boutpp

926d49e

Apply black changes

28eed00

Remain remaing apperances

e81ad71

Apply clang-format changes

566b04e

Use git describe also in boutpp

486656e

make gz/xz switchable via flags

a37751a

Keep version in sdist

20ecaec

Ensure missing git is noticed

92cc09a

otherwise the error is lost as only the last exit code is checked

Also create parent directory

982b8ee

Cleanup and formatting

622b854

Do not assume absolute paths

df31e7b

Do not use symlinks

b4712df

The python zip implementation doesn't support them, so we end up with broken symlinks and thus unloadable libaries.

Merge branch 'next' into 'cmake-install'

cdaf259

dschwoerer and others added 2 commits October 19, 2022 10:40

Enable switchting to non-local versioning, so it can be uploaded

411d8c9

Default is to use local versioning

Apply black changes

5f80662

This was referenced Oct 19, 2022

Switch to CMake #2512

Closed

cmake: Natural Language Support #2365

Closed

dschwoerer requested a review from ZedThree October 25, 2022 08:59

dschwoerer mentioned this pull request Oct 25, 2022

Upload boutpp to pypi #2600

Merged

ZedThree requested changes Nov 2, 2022

View reviewed changes

ZedThree reviewed Nov 2, 2022

View reviewed changes

.github/workflows/black-fix.yml Outdated Show resolved Hide resolved

ZedThree mentioned this pull request Nov 2, 2022

Improve boutpp compatibility with numpy #2589

Merged

2 tasks

dschwoerer added 4 commits November 3, 2022 09:47

Merge remote-tracking branch 'origin/next' into cmake-install

5f616c0

Improve getversion

0779668

* use module-level caching * Add docs on what to update on release * use re.sub for substitution Thanks @ZedThree for the comments

Cleanup backend

4f1ce10

* Use more appropriate python libraries (mkdir, run2) * Add doc-strings * Remove commented out code Thanks @ZedThree for the comments

Fixup merge

b5a854b

dschwoerer commented Nov 3, 2022

View reviewed changes

dschwoerer added 2 commits November 3, 2022 11:01

Fix some newly added version of boutpp

f57e669

Remove duplicate lines

e6f886a

dschwoerer added 2 commits November 3, 2022 11:23

Add boutpp as target that other can depend on

eadcf96

Otherwise the extension suffix needs to be known.

Ensure boutpp target also pseudoinstalls boutpp

ab8ad76

ZedThree previously approved these changes Nov 3, 2022

View reviewed changes

rename boutpp.py not library

962dca2

dschwoerer dismissed ZedThree’s stale review via 962dca2 November 3, 2022 12:01

Specify full path for copying

b4b5068

ZedThree approved these changes Nov 3, 2022

View reviewed changes

ZedThree merged commit 4acdfdc into next Nov 3, 2022

ZedThree deleted the cmake-install branch November 3, 2022 14:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cmake install fixes #2596

cmake install fixes #2596

dschwoerer commented Oct 4, 2022 •

edited

ZedThree left a comment

dschwoerer commented Oct 14, 2022

dschwoerer commented Oct 19, 2022

dschwoerer commented Oct 19, 2022 •

edited

ZedThree left a comment

ZedThree commented Nov 2, 2022

dschwoerer left a comment

dschwoerer commented Nov 3, 2022

ZedThree commented Nov 3, 2022

cmake install fixes #2596

cmake install fixes #2596

Conversation

dschwoerer commented Oct 4, 2022 • edited

ZedThree left a comment

Choose a reason for hiding this comment

dschwoerer commented Oct 14, 2022

dschwoerer commented Oct 19, 2022

dschwoerer commented Oct 19, 2022 • edited

ZedThree left a comment

Choose a reason for hiding this comment

ZedThree commented Nov 2, 2022

dschwoerer left a comment

Choose a reason for hiding this comment

dschwoerer commented Nov 3, 2022

ZedThree commented Nov 3, 2022

dschwoerer commented Oct 4, 2022 •

edited

dschwoerer commented Oct 19, 2022 •

edited