Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cmaking #60

Merged
merged 27 commits into from Aug 15, 2018
Merged

Cmaking #60

merged 27 commits into from Aug 15, 2018

Conversation

paskino
Copy link
Contributor

@paskino paskino commented Aug 14, 2018

closes #59

paskino and others added 22 commits August 4, 2018 23:06
@paskino
working CMake project for Win and conda/no-conda
bd874ab
@paskino
beginning of CMake compiled Matlab binding
a73d878
@paskino
add all CPU Matlab wrappers
e6cb12c
@paskino
updated conda recipe build.sh
2a2eb0e
@paskino
fix conda linux build script
31fc267
@paskino
added BUILD_PYTHON_WRAPPERS BUILD_MATLAB_WRAPPERS BUILD_CUDA options
a490e0a
@paskino
Merge branch 'cmaking' of https://github.com/vais-ral/CCPi-FISTA_Reco…
89d9b70 
…nstruction into cmaking
@paskino
working recipe for Linux GPU. Needs test
c025620
@paskino
add destination for wrapper
4fa0c5b
@paskino
Merge branch 'cmaking' of https://github.com/vais-ral/CCPi-FISTA_Reco…
44c897e 
…nstruction into cmaking
@dkazanc
bugfix initialisation of array
ff5cb4f
@dkazanc
add link flags
7d5b8c2
@dkazanc
MWsize CPU fix
5483927
@dkazanc
MWsize GPU fix
72a4bad
@dkazanc
fixed matlab wrappers compilation GPU
1350156
@dkazanc
add info on installation
dd0527e
@paskino
add install step for PythonWrapper
2879372
@paskino
bugfix install step for PythonWrapper
909a594
@paskino
remove useless ENV{CIL_VERSION}
7fd01c5
@paskino
use generator expression for location of built targets
92794fd
@paskino
removed generator
0cc3dc2
@paskino
fix conda build
35d0d32
@dkazanc
Copy link
Collaborator

dkazanc commented Aug 14, 2018

tested conda install and cmake. Both work great.

@paskino paskino requested a review from dkazanc August 14, 2018 16:20
@paskino
Copy link
Contributor Author

paskino commented Aug 14, 2018 •
edited

Added info on build.
Tested

  • conda build (Linux),
  • conda build (Windows)
  • python build on Linux
  • python build on Windows
  • Matlab build on Windows.
  • Matlab build on Linux

@paskino
Copy link
Contributor Author

paskino commented Aug 14, 2018

don't merge before we finish the whole checklist.

@paskino
Copy link
Contributor Author

paskino commented Aug 15, 2018

Python build still requires some tweaking. The cilreg library should be copied in the python module directory. But on Conda build it works fine, so I should say we can merge.

@dkazanc dkazanc merged commit ccc74f7 into master Aug 15, 2018
@dkazanc dkazanc deleted the cmaking branch August 15, 2018 20:47
@paskino paskino mentioned this pull request Dec 6, 2018
Closed
paskino pushed a commit that referenced this pull request Jan 22, 2021
@KrisThielemans
Compile STIR with C++11 but force boost::shared_ptr
7478a64 
Current STIR master will use std::shared_ptr by default when using
C++-11. That breaks SIRF (see Issue #60). As work-around, we force
usage of boost::shared_ptr.

It might not be necessary to compile STIR with C++11, but
it now has some ugly work-arounds related to unique_ptr if that isn't
available which can break SIRF.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dkazanc dkazanc Awaiting requested review from dkazanc

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

create CMake project
2 participants
@paskino @dkazanc