Skip to content
Snippets Groups Projects
  1. Dec 18, 2021
    • Jean-Christophe Fillion-Robin's avatar
      COMP: Fix iMSTK integration updating VegaFEM and removing obsolete PThreads project · 6bf0192c
      Jean-Christophe Fillion-Robin authored
      Considering that in VegaFEM v4.0, pthreads was replaced with
      Intel TBB (see [1]), this commit removes the references to "pthread" and
      also removes the corresponding custom CMake module.
      
      [1] http://barbic.usc.edu/vega/download.html
      
      It also fixes error like the following reported when integrating iMSTK in
      project (e.g Slicer-based app) already looking up threading libraries
      using "FindThreads" module provided by CMake:
      
         -- Found PThreads: C:/path/to/SlicerCustomApp-build/PThreads-install/include/pthread
          CMake Error at C:/path/to/SlicerCustomApp-build/iMSTK/CMake/Utilities/imstkFind.cmake:214 (add_library):
            add_library cannot create imported target "Threads::Threads" because
            another target with the same name already exists.
          Call Stack (most recent call first):
            C:/path/to/SlicerCustomApp-build/iMSTK/CMake/FindPThreads.cmake:8 (imstk_find_package)
            C:/path/to/SlicerCustomApp-build/VegaFEM-install/lib/cmake/VegaFEM/VegaFEMConfig.cmake:8 (find_package)
            C:/path/to/SlicerCustomApp-build/CTK/CMake/CMakeFindDependencyMacro.cmake:90 (find_package)
            C:/path/to/SlicerCustomApp-build/imstk-build/iMSTKConfig.cmake:144 (find_dependency)
            C:/path/to/SlicerCustomApp/Modules/CLI/MyCLI/CMakeLists.txt:33 (find_package)
      
      List of VegaFEM changes:
      
      $ git shortlog be55ca42b..b10672cf1 --no-merges
      Jean-Christophe Fillion-Robin (1):
            COMP: Remove obsolete and unused PThreads requirement
      6bf0192c
    • Jean-Christophe Fillion-Robin's avatar
      COMP: Update VegaFEM to fix gcc 5.x build error in sparseMatrix.cpp · 9e526df7
      Jean-Christophe Fillion-Robin authored
      List of changes:
      
      $ git shortlog 5be652501..be55ca42b --no-merges
      Jean-Christophe Fillion-Robin (1):
            COMP: Fix gcc 5.x build error in sparseMatrix.cpp related to ambiguous isnan call
      9e526df7
    • Jean-Christophe Fillion-Robin's avatar
      COMP: Update external project to use "VegaFEM-CMake" instead of "vegafemv4.0" · 601642f1
      Jean-Christophe Fillion-Robin authored
      This commit does not include any functional changes.
      
      It partially reverts 3730f119 (ENH: Model reduction fixed up, toggleable
      in cmake, default off) by switching back to using the existing "VegaFEM-CMake"
      project where the master branch has been updated to include all the commit
      originally associated with the "build_model_reduction" from "vegafemv4.0"
      project.
      
      To avoid inflating the size of the project, the following commits
      from the "build_model_reduction" available on "vegafemv4.0" have
      been squashed together while "rebasing" the changes:
      * ENH: Initial commit of vegaFEMv4.0 code
      * REFAC: Remove all the extra files that are not code
      
      This allows to keep the size to ~22MiB instead of the ~126MiB.
      601642f1
  2. Dec 17, 2021
Loading