Merge pull request #5 from polyfem/action

Action

Author: teseoch

.clang-format

@@ -0,0 +1,44 @@
+---
+# https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+Language: Cpp
+BasedOnStyle: LLVM
+# ColumnLimit: 80
+ColumnLimit: 0
+UseTab: ForContinuationAndIndentation
+IndentWidth: 4
+TabWidth: 4
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel:  true
+  AfterClass:      true
+  AfterControlStatement: Always
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  AfterExternBlock: true
+  BeforeCatch:     true
+  BeforeElse:      true
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+AllowShortIfStatementsOnASingleLine: false
+IndentCaseLabels: false
+SortIncludes: false
+BreakStringLiterals: false
+AlignTrailingComments: true
+FixNamespaceComments: true
+ContinuationIndentWidth: 4
+NamespaceIndentation: All
+AccessModifierOffset: -4
+BreakBeforeBinaryOperators: NonAssignment
+# ReflowComments: true
+# BinPackParameters: false
+# AllowAllParametersOfDeclarationOnNextLine: true
+# AlignAfterOpenBracket: AlwaysBreak
+...

.github/workflows/continuous.yml

@@ -25,6 +25,9 @@ jobs:
             name: Windows
           - os: macOS-latest
             name: MacOS
+    env:
+      if: runner.os == 'Windows'
+      USE_CHOLMOD: 0
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -52,6 +55,7 @@ jobs:
           echo "CMAKE_GENERATOR=NMake Makefiles" >> $GITHUB_ENV
           echo "CXX=cl.exe" >> $GITHUB_ENV
           echo "CC=cl.exe" >> $GITHUB_ENV
+          echo "USE_CHOLMOD=0" >> $GITHUB_ENV
           conda init powershell
 
       - name: Build (Debug)

.gitignore

@@ -13,6 +13,9 @@ __pycache__
 *.obj
 *.pyc
 *.vtu
+*.pvd
 *.egg-info
 *.so
-temp-plot.html
+temp-plot.html
+data*
+*libTracyClient.*

CMakeLists.txt

@@ -1,22 +1,29 @@
 ################################################################################
-cmake_minimum_required(VERSION 3.1)
-project(polyfempy)
-################################################################################
+# Check required CMake version
+set(REQUIRED_CMAKE_VERSION "3.14.0")
+cmake_minimum_required(VERSION ${REQUIRED_CMAKE_VERSION})
 
-if(INPUT_THIRD_PARTY_DIR)
-	set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${INPUT_THIRD_PARTY_DIR}/)
+if(INPUT_POLYFEMPY_DATA_ROOT)
+    set(POLYFEMPY_DATA_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT_POLYFEMPY_DATA_ROOT}/")
 else()
-	set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/)
+    set(POLYFEMPY_DATA_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/data/")
+endif()
+if(NOT EXISTS ${POLYFEMPY_DATA_ROOT})
+    file(MAKE_DIRECTORY ${POLYFEMPY_DATA_ROOT})
 endif()
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+project(polyfempy)
+################################################################################
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/recipes/")
 
 # Color output
 include(UseColors)
 
 # Prepend function
 include(PrependCurrentPath)
 
-
 # Extra warnings
 include(Warnings)
 
@@ -29,38 +36,24 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # Generate position independent code by default
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-################################################################################
-
-
-# Setup dependencies
-include(PolyfemPythonDependencies)
-
 ################################################################################
 # Polyfem library
 ################################################################################
 
-
-
-
-# polyfem
-polyfem_python_download_polyfem()
-add_subdirectory(${THIRD_PARTY_DIR}/polyfem)
-
-# pybind11
-polyfem_python_download_pybind11()
-add_subdirectory(${THIRD_PARTY_DIR}/pybind11)
-
+# dependencies
+include(polyfem)
+include(pybind11)
+include(pybind11_json)
 
 #for testing purpose
-polyfem_python_download_data()
-
+include(polyfem_data)
 
 ################################################################################
 # Subdirectories
 ################################################################################
-add_library(polyfempy MODULE src/binding.cpp)
-target_link_libraries(polyfempy PRIVATE polyfem)
-target_link_libraries(polyfempy PRIVATE pybind11::module)
+add_library(polyfempy MODULE src/binding.cpp src/raster.cpp)
+target_link_libraries(polyfempy PRIVATE polyfem::polyfem pybind11::module pybind11::json)
+
 set_target_properties(polyfempy PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}" SUFFIX "${PYTHON_MODULE_EXTENSION}")