From 7763f05ced9df813cbfd796a7b9673c3ef53d6c2 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Tue, 26 Dec 2023 14:40:56 -0500 Subject: [PATCH] Adjustments to the anaconda build script for macOS. Signed-off-by: Michael Jackson --- CMakePresets.json | 10 +- conda/bld.bat | 130 ++++++++++++---- conda/build.sh | 140 ++++++++++++++++-- conda/meta.yaml | 9 +- src/Plugins/ITKImageProcessing/CMakeLists.txt | 12 +- .../Algorithms/WriteAbaqusHexahedron.cpp | 6 +- 6 files changed, 250 insertions(+), 57 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index c657bb03ce..1c2c38de5c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -261,23 +261,23 @@ }, "span-lite_DIR": { "type": "PATH", - "value": "$env{SRC_DIR}/sdk/span-lite/lib/cmake/span-lite" + "value": "$env{PREFIX}/lib/cmake/span-lite" }, "expected-lite_DIR": { "type": "PATH", - "value": "$env{SRC_DIR}/sdk/expected-lite/lib/cmake/expected-lite" + "value": "$env{PREFIX}/lib/cmake/expected-lite" }, "H5Support_DIR": { "type": "PATH", - "value": "$env{SRC_DIR}/sdk/H5Support/share/H5Support" + "value": "$env{PREFIX}/share/H5Support" }, "EbsdLib_DIR": { "type": "PATH", - "value": "$env{SRC_DIR}/sdk/EbsdLib/share/EbsdLib" + "value": "$env{PREFIX}/share/EbsdLib" }, "nod_DIR": { "type": "PATH", - "value": "$env{SRC_DIR}/sdk/nod/share/nod" + "value": "$env{PREFIX}/share/nod" }, "HDF5_NO_FIND_PACKAGE_CONFIG_FILE": { "type": "BOOL", diff --git a/conda/bld.bat b/conda/bld.bat index f1c2979375..6b3e157f13 100644 --- a/conda/bld.bat +++ b/conda/bld.bat @@ -6,16 +6,20 @@ mkdir sdk +set lib_prefix=%LIBRARY_PREFIX:\=/% +echo lib_prefix = %lib_prefix% + :: **************************************************************************** :: Build the H5Support library :: **************************************************************************** - +echo *************************** h5support ****************************************** +cd %SRC_DIR% mkdir h5support_build cd h5support_build -cmake -S "../H5Support" -B . -G "Ninja" ^ +cmake -S "%SRC_DIR%/H5Support" -B . -G "Ninja" ^ -D CMAKE_BUILD_TYPE:STRING=Release ^ - -D CMAKE_INSTALL_PREFIX:PATH="%SRC_DIR%/sdk/H5Support" ^ + -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ -D H5Support_INCLUDE_QT_API:BOOL=OFF ^ -D H5Support_INSTALL_HDF5:BOOL=OFF ^ @@ -39,15 +43,17 @@ if errorlevel 1 exit 1 cd .. :: **************************************************************************** -:: Build the EbsdLib library +:: Install the EbsdLibrary into the python build environment so that stubgen +:: has access to it. :: **************************************************************************** - +echo *************************** EbsdLib ****************************************** +cd %SRC_DIR% mkdir ebsdlib_build cd ebsdlib_build -cmake -S "../EbsdLib" -B . -G "Ninja" ^ +cmake -S "%SRC_DIR%/EbsdLib" -B . -G "Ninja" ^ -D CMAKE_BUILD_TYPE:STRING=Release ^ - -D CMAKE_INSTALL_PREFIX:PATH="%SRC_DIR%/sdk/EbsdLib" ^ + -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ -D DREAM3D_ANACONDA:BOOL=ON ^ -D CMP_TBB_ENABLE_COPY_INSTALL:BOOL=OFF ^ @@ -58,7 +64,7 @@ cmake -S "../EbsdLib" -B . -G "Ninja" ^ -D TBB_STATUS_PRINTED:BOOL=ON ^ -D CMP_HDF5_USE_CONFIG:BOOL=OFF ^ -D GVS_GIT_HASH:STRING="6c0e5ec992472eeae5df9d627de524b59b971fab" ^ - -D H5Support_DIR:PATH="%SRC_DIR%/sdk/H5Support/share/H5Support" + -D H5Support_DIR:PATH="%lib_prefix%/share/H5Support" if errorlevel 1 exit 1 cmake --build . --target all @@ -72,13 +78,14 @@ cd .. :: **************************************************************************** :: Build the expected-light library :: **************************************************************************** - +echo *************************** expected-light ****************************************** +cd %SRC_DIR% mkdir expected-lite_build cd expected-lite_build -cmake -S "../expected-lite" -B . -G "Ninja" ^ +cmake -S "%SRC_DIR%/expected-lite" -B . -G "Ninja" ^ -D CMAKE_BUILD_TYPE:STRING=Release ^ - -D CMAKE_INSTALL_PREFIX:PATH="%SRC_DIR%/sdk/expected-lite" ^ + -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ -D EXPECTED_LITE_OPT_BUILD_TESTS:BOOL=OFF ^ -D EXPECTED_LITE_OPT_BUILD_EXAMPLES:BOOL=OFF @@ -95,13 +102,14 @@ cd .. :: **************************************************************************** :: Build the span-light library :: **************************************************************************** - +echo *************************** span-light ****************************************** +cd %SRC_DIR% mkdir span-lite_build cd span-lite_build -cmake -S "../span-lite" -B . -G "Ninja" ^ +cmake -S "%SRC_DIR%/span-lite" -B . -G "Ninja" ^ -D CMAKE_BUILD_TYPE:STRING=Release ^ - -D CMAKE_INSTALL_PREFIX:PATH="%SRC_DIR%/sdk/span-lite" ^ + -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ -D SPAN_LITE_OPT_BUILD_TESTS:BOOL=OFF ^ -D SPAN_LITE_OPT_BUILD_EXAMPLES:BOOL=OFF @@ -118,13 +126,14 @@ cd .. :: **************************************************************************** :: Build the nod library :: **************************************************************************** - +echo *************************** nod ****************************************** +cd %SRC_DIR% mkdir nod_build cd nod_build -cmake -S "../nod" -B . -G "Ninja" ^ +cmake -S "%SRC_DIR%/nod" -B . -G "Ninja" ^ -D CMAKE_BUILD_TYPE:STRING=Release ^ - -D CMAKE_INSTALL_PREFIX:PATH="%SRC_DIR%/sdk/nod" ^ + -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" if errorlevel 1 exit 1 @@ -134,30 +143,95 @@ if errorlevel 1 exit 1 cmake --build . --target install if errorlevel 1 exit 1 +cd .. + :: **************************************************************************** -:: Install the EbsdLibrary into the python build environment so that stubgen -:: has access to it. +:: Build the ITK library :: **************************************************************************** -cd .. -cd ebsdlib_build +echo *************************** ITK ****************************************** +cd %SRC_DIR% +mkdir itk_build +cd itk_build + +cmake -S "%SRC_DIR%/itk" -B . -G "Ninja" $CMAKE_ARGS ^ + -DCMAKE_BUILD_TYPE:STRING=Release ^ + -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ + -D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ + -D Eigen3_DIR=%lib_prefix%/share/eigen3/cmake ^ + -DBUILD_SHARED_LIBS:STRING=ON ^ + -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0 ^ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=OFF ^ + -DCMAKE_SKIP_RPATH:BOOL=OFF ^ + -DCMAKE_CXX_STANDARD:STRING=17 ^ + -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON ^ + -DBUILD_DOCUMENTATION:BOOL=OFF ^ + -DBUILD_EXAMPLES:BOOL=OFF ^ + -DBUILD_TESTING:BOOL=OFF ^ + -DKWSYS_USE_MD5:BOOL=ON ^ + -DITK_LEGACY_REMOVE:BOOL=ON ^ + -DITK_FUTURE_LEGACY_REMOVE:BOOL=ON ^ + -DITK_LEGACY_SILENT:BOOL=OFF ^ + -DITKV4_COMPATIBILITY:BOOL=OFF ^ + -DITK_USE_SYSTEM_EIGEN:BOOL=ON ^ + -DITK_USE_SYSTEM_HDF5:BOOL=ON ^ + -DITKGroup_Core:BOOL=ON ^ + -DITKGroup_Filtering:BOOL=ON ^ + -DITKGroup_Registration:BOOL=ON ^ + -DITKGroup_Segmentation:BOOL=ON ^ + -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF ^ + -DModule_ITKTestKernel:BOOL=OFF ^ + -DModule_ITKReview:BOOL=OFF ^ + -DModule_SCIFIO=OFF ^ + -DModule_ITKMetricsv4:BOOL=OFF ^ + -DModule_ITKOptimizersv4:BOOL=OFF ^ + -DModule_ITKRegistrationMethodsv4:BOOL=OFF ^ + -DModule_ITKConvolution:BOOL=ON ^ + -DModule_ITKDenoising:BOOL=ON ^ + -DModule_ITKImageNoise:BOOL=ON ^ + -DITKGroup_IO:BOOL=OFF ^ + -DITKGroup_Core:BOOL=OFF ^ + -DModule_ITKGDCM:BOOL=OFF ^ + -DModule_ITKIOBioRad:BOOL=ON ^ + -DModule_ITKIOBMP:BOOL=ON ^ + -DModule_ITKIOGE:BOOL=ON ^ + -DModule_ITKIOGIPL:BOOL=ON ^ + -DModule_ITKIOImageBase:BOOL=ON ^ + -DModule_ITKIOIPL:BOOL=ON ^ + -DModule_ITKIOJPEG:BOOL=ON ^ + -DModule_ITKIOMeta:BOOL=ON ^ + -DModule_ITKIOMRC:BOOL=ON ^ + -DModule_ITKIONIFTI:BOOL=ON ^ + -DModule_ITKIONRRD:BOOL=ON ^ + -DModule_ITKIOPNG:BOOL=ON ^ + -DModule_ITKIOStimulate:BOOL=ON ^ + -DModule_ITKIOTIFF:BOOL=ON ^ + -DModule_ITKIOVTK:BOOL=ON ^ + -DModule_ITKIOTransformBase:BOOL=ON ^ + -DITK_SKIP_PATH_LENGTH_CHECKS:BOOL=ON ^ + -DITK_CUSTOM_LIBRARY_SUFFIX:STRING="-NX-$ITK_VERSION" -cmake -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" . if errorlevel 1 exit 1 -cmake --build . --target install +cmake --build . --target all if errorlevel 1 exit 1 -cd .. +cmake --build . --target install +if errorlevel 1 exit 1 :: **************************************************************************** :: Build the simplnx library :: **************************************************************************** - +echo *************************** SIMPLNX ****************************************** +cd %SRC_DIR% mkdir build cd build -cmake --preset conda-win ../simplnx +cmake --preset conda-win %SRC_DIR%/simplnx ^ + -D CMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^ + -D CMAKE_SYSTEM_PREFIX_PATH:PATH="%LIBRARY_PREFIX%" ^ + -D Python3_EXECUTABLE:FILEPATH=%PREFIX%/python.exe + if errorlevel 1 exit 1 cmake --build . --target all @@ -166,3 +240,7 @@ if errorlevel 1 exit 1 cmake --build . --target install if errorlevel 1 exit 1 + +echo ********************************************************************* +echo BUILD COMPLETE +echo ********************************************************************* diff --git a/conda/build.sh b/conda/build.sh index a0c2a68639..c4bd67b7c2 100644 --- a/conda/build.sh +++ b/conda/build.sh @@ -2,14 +2,31 @@ mkdir sdk -# "H5Support" +echo "PREFIX: $PREFIX" +echo "LIBRARY_PREFIX: $LIBRARY_PREFIX" +echo "SRC_DIR: $SRC_DIR" +echo "target_platform: $target_platform" + +echo "#-------------------------------------------------------------------------------" +echo " Copying Example Pipelines" +echo "#-------------------------------------------------------------------------------" + +mkdir -p "$PREFIX/share/simplnx/pipelines/" +cp -r "simplnx/src/Plugins/SimplnxCore/pipelines" "$PREFIX/share/simplnx/pipelines/SimplnxCore/" +cp -r "simplnx/src/Plugins/OrientationAnalysis/pipelines" "$PREFIX/share/simplnx/pipelines/OrientationAnalysis/" +cp -r "simplnx/src/Plugins/ITKImageProcessing/pipelines" "$PREFIX/share/simplnx/pipelines/ITKImageProcessing/" + +# ***************************************************************************** +echo "#-------------------------------------------------------------------------------" +echo " BUILDING H5Support" +echo "#-------------------------------------------------------------------------------" mkdir h5support_build cd h5support_build cmake -S "../H5Support" -B . -G "Ninja" $CMAKE_ARGS \ -D CMAKE_BUILD_TYPE:STRING=Release \ - -D CMAKE_INSTALL_PREFIX:PATH="$SRC_DIR/sdk/H5Support" \ + -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \ -D H5Support_INCLUDE_QT_API:BOOL=OFF \ -D H5Support_INSTALL_HDF5:BOOL=OFF \ @@ -29,14 +46,17 @@ cmake --build . --target install cd .. -# "EbsdLib" +# ***************************************************************************** +echo "#-------------------------------------------------------------------------------" +echo " BUILDING EbsdLib" +echo "#-------------------------------------------------------------------------------" mkdir ebsdlib_build cd ebsdlib_build cmake -S "../EbsdLib" -B . -G "Ninja" $CMAKE_ARGS \ -D CMAKE_BUILD_TYPE:STRING=Release \ - -D CMAKE_INSTALL_PREFIX:PATH="$SRC_DIR/sdk/EbsdLib" \ + -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \ -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0" \ -D DREAM3D_ANACONDA:BOOL=ON \ @@ -56,14 +76,17 @@ cmake --build . --target install cd .. -# "expected-lite" +# ***************************************************************************** +echo "#-------------------------------------------------------------------------------" +echo " BUILDING expected-lite" +echo "#-------------------------------------------------------------------------------" mkdir expected-lite_build cd expected-lite_build cmake -S "../expected-lite" -B . -G "Ninja" $CMAKE_ARGS \ -D CMAKE_BUILD_TYPE:STRING=Release \ - -D CMAKE_INSTALL_PREFIX:PATH="$SRC_DIR/sdk/expected-lite" \ + -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \ -D EXPECTED_LITE_OPT_BUILD_TESTS:BOOL=OFF \ -D EXPECTED_LITE_OPT_BUILD_EXAMPLES:BOOL=OFF @@ -74,14 +97,17 @@ cmake --build . --target install cd .. -# "span-lite" +# ***************************************************************************** +echo "#-------------------------------------------------------------------------------" +echo " BUILDING span-lite" +echo "#-------------------------------------------------------------------------------" mkdir span-lite_build cd span-lite_build cmake -S "../span-lite" -B . -G "Ninja" $CMAKE_ARGS \ -D CMAKE_BUILD_TYPE:STRING=Release \ - -D CMAKE_INSTALL_PREFIX:PATH="$SRC_DIR/sdk/span-lite" \ + -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \ -D SPAN_LITE_OPT_BUILD_TESTS:BOOL=OFF \ -D SPAN_LITE_OPT_BUILD_EXAMPLES:BOOL=OFF @@ -92,14 +118,17 @@ cmake --build . --target install cd .. -# "nod" +# ***************************************************************************** +echo "#-------------------------------------------------------------------------------" +echo " BUILDING nod" +echo "#-------------------------------------------------------------------------------" mkdir nod_build cd nod_build cmake -S "../nod" -B . -G "Ninja" $CMAKE_ARGS \ -D CMAKE_BUILD_TYPE:STRING=Release \ - -D CMAKE_INSTALL_PREFIX:PATH="$SRC_DIR/sdk/nod" \ + -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ -D CMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" cmake --build . --target all @@ -108,20 +137,101 @@ cmake --build . --target install cd .. -# "simplnx" +# ***************************************************************************** +echo "#-------------------------------------------------------------------------------" +echo " BUILDING ITK" +echo "#-------------------------------------------------------------------------------" +mkdir itk_build +cd itk_build + +cmake -S "../itk" -B . -G "Ninja" $CMAKE_ARGS \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ + -DCMAKE_SYSTEM_PREFIX_PATH:PATH="$PREFIX" \ + -DEigen3_DIR=${PREFIX}/share/eigen3/cmake \ + -DBUILD_SHARED_LIBS:STRING=ON \ + -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.0 \ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=OFF \ + -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DCMAKE_CXX_STANDARD:STRING=17 \ + -DCMAKE_CXX_STANDARD_REQUIRED:BOOL=ON \ + -DBUILD_DOCUMENTATION:BOOL=OFF \ + -DBUILD_EXAMPLES:BOOL=OFF \ + -DBUILD_TESTING:BOOL=OFF \ + -DKWSYS_USE_MD5:BOOL=ON \ + -DITK_LEGACY_REMOVE:BOOL=ON \ + -DITK_FUTURE_LEGACY_REMOVE:BOOL=ON \ + -DITK_LEGACY_SILENT:BOOL=OFF \ + -DITKV4_COMPATIBILITY:BOOL=OFF \ + -DITK_USE_SYSTEM_EIGEN:BOOL=ON \ + -DITK_USE_SYSTEM_HDF5:BOOL=ON \ + -DITKGroup_Core:BOOL=ON \ + -DITKGroup_Filtering:BOOL=ON \ + -DITKGroup_Registration:BOOL=ON \ + -DITKGroup_Segmentation:BOOL=ON \ + -DITK_BUILD_DEFAULT_MODULES:BOOL=OFF \ + -DModule_ITKTestKernel:BOOL=OFF \ + -DModule_ITKReview:BOOL=OFF \ + -DModule_SCIFIO=OFF \ + -DModule_ITKMetricsv4:BOOL=OFF \ + -DModule_ITKOptimizersv4:BOOL=OFF \ + -DModule_ITKRegistrationMethodsv4:BOOL=OFF \ + -DModule_ITKConvolution:BOOL=ON \ + -DModule_ITKDenoising:BOOL=ON \ + -DModule_ITKImageNoise:BOOL=ON \ + -DITKGroup_IO:BOOL=OFF \ + -DITKGroup_Core:BOOL=OFF \ + -DModule_ITKGDCM:BOOL=OFF \ + -DModule_ITKIOBioRad:BOOL=ON \ + -DModule_ITKIOBMP:BOOL=ON \ + -DModule_ITKIOGE:BOOL=ON \ + -DModule_ITKIOGIPL:BOOL=ON \ + -DModule_ITKIOImageBase:BOOL=ON \ + -DModule_ITKIOIPL:BOOL=ON \ + -DModule_ITKIOJPEG:BOOL=ON \ + -DModule_ITKIOMeta:BOOL=ON \ + -DModule_ITKIOMRC:BOOL=ON \ + -DModule_ITKIONIFTI:BOOL=ON \ + -DModule_ITKIONRRD:BOOL=ON \ + -DModule_ITKIOPNG:BOOL=ON \ + -DModule_ITKIOStimulate:BOOL=ON \ + -DModule_ITKIOTIFF:BOOL=ON \ + -DModule_ITKIOVTK:BOOL=ON \ + -DModule_ITKIOTransformBase:BOOL=ON \ + -DITK_CUSTOM_LIBRARY_SUFFIX:STRING="-NX-$ITK_VERSION" + + +#if errorlevel 1 exit 1 + +cmake --build . --target all +#if errorlevel 1 exit 1 + +cmake --build . --target install +#if errorlevel 1 exit 1 + +cd .. + +# ***************************************************************************** +echo "#-------------------------------------------------------------------------------" +echo " BUILDING simplnx" +echo "#-------------------------------------------------------------------------------" mkdir build cd build -cmake --preset $SIMPLNX_CMAKE_PRESET ../simplnx $CMAKE_ARGS -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0" +cmake --preset $SIMPLNX_CMAKE_PRESET ../simplnx $CMAKE_ARGS \ + -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING="11.0"\ + -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" \ + -D Python3_EXECUTABLE:FILEPATH=$PREFIX/bin/python3 + cmake --build . --target all cmake --build . --target install cd .. -cd ebsdlib_build -cmake -D CMAKE_INSTALL_PREFIX:PATH="$PREFIX" . -cmake --build . --target install +echo "*********************************************************************************" +echo " BUILD SCRIPT COMPLETE" +echo "*********************************************************************************" diff --git a/conda/meta.yaml b/conda/meta.yaml index 3bccc8d23d..df78e6db52 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -25,12 +25,17 @@ source: folder: span-lite - url: https://raw.githubusercontent.com/BlueQuartzSoftware/simplnx-registry/9a5db7b5fa02b2495eb51654cbaab3c63820c779/ports/nod/CMakeLists.txt folder: nod + - git_url: https://github.com/insightsoftwareconsortium/ITK + git_rev: v5.2.1 + folder: itk build: number: 0 script_env: + - SIMPLNX_CMAKE_PRESET=conda-win # [win] - SIMPLNX_CMAKE_PRESET=conda-linux # [linux] - SIMPLNX_CMAKE_PRESET=conda-osx # [osx] + - ITK_VERSION=5.2.1 requirements: build: @@ -46,8 +51,6 @@ requirements: - eigen - fmt =10 - hdf5 =1.12 - - libitk =5.2 - - libitk-devel =5.2 - nlohmann_json - pybind11 >=2.10 - reproc-cpp @@ -58,12 +61,12 @@ requirements: - myst-parser - sphinx-markdown-tables - sphinx_rtd_theme + run: - python - numpy - fmt =10 - hdf5 =1.12 - - libitk =5.2 - reproc-cpp - tbb - zlib diff --git a/src/Plugins/ITKImageProcessing/CMakeLists.txt b/src/Plugins/ITKImageProcessing/CMakeLists.txt index 78ef5afce8..fa1317bf73 100644 --- a/src/Plugins/ITKImageProcessing/CMakeLists.txt +++ b/src/Plugins/ITKImageProcessing/CMakeLists.txt @@ -28,10 +28,10 @@ set(ItkComponents ITKOptimizers # ITKRegistrationCommon - ITKReview + # ITKReview + # ITKTestKernel ITKSmoothing ITKStatistics - ITKTestKernel ITKTransform ITKWatersheds ) @@ -78,7 +78,9 @@ set(FilterList set(AlgorithmList ) -if(NOT SIMPLNX_CONDA_BUILD AND NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) +if(NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN + # AND NOT SIMPLNX_CONDA_BUILD +) list(APPEND FilterList ITKBinaryContourImage ITKBinaryOpeningByReconstructionImage @@ -95,8 +97,8 @@ if(NOT SIMPLNX_CONDA_BUILD AND NOT ITKIMAGEPROCESSING_LEAN_AND_MEAN) ITKSignedMaurerDistanceMapImage ITKValuedRegionalMaximaImage ITKValuedRegionalMinimaImage -) - endif() + ) +endif() # ------------------------------------------------------------------------------ diff --git a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp index ecaf8c8bbf..6b3e499838 100644 --- a/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp +++ b/src/Plugins/SimplnxCore/src/SimplnxCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp @@ -96,7 +96,7 @@ int32 writeNodes(WriteAbaqusHexahedron* filter, const std::string& fileName, usi int64 milliDiff = std::chrono::duration_cast(now - initialTime).count(); if(milliDiff > 1000) { - std::string percentage = "Writing Nodes (File 1/5) " + StringUtilities::number(static_cast((float32)(nodeIndex) / (float32)(totalPoints)*100)) + "% Completed "; + std::string percentage = "Writing Nodes (File 1/5) " + StringUtilities::number(static_cast((float32)(nodeIndex) / (float32)(totalPoints) * 100)) + "% Completed "; float32 timeDiff = ((float32)nodeIndex / (float32)(milliDiff)); int64 estimatedTime = (float32)(totalPoints - nodeIndex) / timeDiff; std::string timeRemaining = " || Est. Time Remain: " + format_duration(std::chrono::milliseconds(estimatedTime)); @@ -160,7 +160,7 @@ int32 writeElems(WriteAbaqusHexahedron* filter, const std::string& fileName, con int64 milliDiff = std::chrono::duration_cast(now - initialTime).count(); if(milliDiff > 1000) { - std::string percentage = "Writing Elements (File 2/5) " + StringUtilities::number(static_cast((float32)(index) / (float32)(totalPoints)*100)) + "% Completed "; + std::string percentage = "Writing Elements (File 2/5) " + StringUtilities::number(static_cast((float32)(index) / (float32)(totalPoints) * 100)) + "% Completed "; float32 timeDiff = ((float32)index / (float32)(milliDiff)); int64 estimatedTime = (float32)(totalPoints - index) / timeDiff; std::string timeRemaining = " || Est. Time Remain: " + format_duration(std::chrono::milliseconds(estimatedTime)); @@ -240,7 +240,7 @@ int32 writeElset(WriteAbaqusHexahedron* filter, const std::string& fileName, siz int64 milliDiff = std::chrono::duration_cast(now - initialTime).count(); if(milliDiff > 1000) { - std::string percentage = "Writing Element Sets (File 4/5) " + StringUtilities::number(static_cast((float32)(voxelId) / (float32)(maxGrainId)*100)) + "% Completed "; + std::string percentage = "Writing Element Sets (File 4/5) " + StringUtilities::number(static_cast((float32)(voxelId) / (float32)(maxGrainId) * 100)) + "% Completed "; float32 timeDiff = ((float32)voxelId / (float32)(milliDiff)); auto estimatedTime = static_cast((float32)(maxGrainId - voxelId) / timeDiff); std::string timeRemaining = " || Est. Time Remain: " + format_duration(std::chrono::milliseconds(estimatedTime));