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.

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

Upgraded fast to latest version and implemented manual seed point #5

Conversation

smistad
Copy link
Member

@smistad smistad commented May 15, 2017

Only tested on ubuntu 16.04

@smistad smistad changed the title Upgraded fast to latest version Upgraded fast to latest version and implemented manual seed point May 15, 2017
@jonei jonei changed the base branch from develop to bugfix/FX-19-airwaysegmentation-algorithm-does-not May 16, 2017 07:40
@jonei jonei merged commit fdbf088 into SINTEFMedtek:bugfix/FX-19-airwaysegmentation-algorithm-does-not May 16, 2017
@jonei
Copy link
Contributor

jonei commented May 16, 2017

This gives errors on creating the CustusX installer on Linux and Mac. The variable ${FAST_SOURCE_DIR}
which was used to copy files into the installer in the Airways plugin is now empty. Can you look into that?

@jonei
Copy link
Contributor

jonei commented May 16, 2017

On Windows there is a build error for many files because of some MP flag I think. Can you look into that?
E.g.:
[shell ###] FAILED: CMakeFiles/FAST.dir/source/FAST/Algorithms/ImageSlicer/ImageSlicer.cpp.obj
...
-IC:\Qt\Qt5.6.0\5.6\msvc2015_64.\mkspecs\win32-msvc2015 /DWIN32 /D_WINDOWS /W3 /GR /EHsc /openmp ;/MP /MD /O2 /Ob2 /D NDEBUG /showIncludes /FoCMakeFiles\FAST.dir\source\FAST\Algorithms\ImageSlicer\ImageSlicer.cpp.obj
...
[shell ###] MP
[shell ###] c1xx: fatal error C1083: Cannot open source file: ';/MP': No such file or directory

@smistad
Copy link
Member Author

smistad commented May 16, 2017

There is a ; which should not be there. Try replacing
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" "/MP")
with
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")

in FAST/CMakeLists.txt. If that works on your system I will add the fix to FAST.

@smistad
Copy link
Member Author

smistad commented May 16, 2017

I have pushed a new commit to my upgrade-fast branch which should fix the ${FAST_SOURCE_DIR} issue. However since this PR has status merged, I don't think the commit will show in this PR. smistad@1dde3a2

@jonei
Copy link
Contributor

jonei commented May 16, 2017

I see you have opened a new PR.
Your suggestion fixed the first problem with the MP flag, but I got this error then:
C:\dev\cx\FAST\FAST\source\FAST\Algorithms\IterativeClosestPoint\IterativeClosestPoint.cpp(79): error C3016: 'b': index variable in OpenMP 'for' statement must have signed integral type
Setting the first looping index after the pragma to int madde it compile:
#pragma omp parallel for
for(uint b = 0; b < B.cols(); ++b) {
==>
#pragma omp parallel for
for(int b = 0; b < B.cols(); ++b) {

CustusXMachine pushed a commit that referenced this pull request Oct 26, 2017
…ure/CX-182-remove-cxlegacysingletons.h to develop

* commit '8f72285b0a7f1967b3a0e57987f94222c3b05a22':
  CX-182: Removed file from Qt moc.
CustusXMachine pushed a commit that referenced this pull request Mar 17, 2020
…ugfix/CX-211-bronchoscopynavigation-unlock-orientation to develop

* commit '61e41597a394e96ef23a5231a54c776d554dd6c3':
  CX-211: Turned off lock of orientation in bronchoscopy navigation.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants