Fix pipeline on Mac (#407)

* Refresh ccache

* Enforce CXX standard to 14 on each module

* Change variable name to comply with E741

Signed-off-by: julian <[email protected]>
Co-authored-by: Umberto Lupo <[email protected]>

Author: reds-heig

CMakeLists.txt

@@ -18,11 +18,13 @@ set(HERA_DIR "gtda/externals/hera")
 #######################################################################
 
 pybind11_add_module(gtda_ripser "${BINDINGS_DIR}/ripser_bindings.cpp")
+set_property(TARGET gtda_ripser PROPERTY CXX_STANDARD 14)
+
 if(OpenMP_FOUND)
   target_link_libraries(gtda_ripser PRIVATE OpenMP::OpenMP_CXX)
 endif()
-target_compile_definitions(gtda_ripser PRIVATE ASSEMBLE_REDUCTION_MATRIX=1)
 
+target_compile_definitions(gtda_ripser PRIVATE ASSEMBLE_REDUCTION_MATRIX=1)
 target_include_directories(gtda_ripser PRIVATE "${RIPSER_SRC_DIR}/ripser")
 
 if(MSVC)
@@ -38,11 +40,13 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_ripser_coeff "${BINDINGS_DIR}/ripser_bindings.cpp")
+set_property(TARGET gtda_ripser_coeff PROPERTY CXX_STANDARD 14)
+
 if(OpenMP_FOUND)
   target_link_libraries(gtda_ripser_coeff PRIVATE OpenMP::OpenMP_CXX)
 endif()
-target_compile_definitions(gtda_ripser_coeff PRIVATE USE_COEFFICIENTS=1 ASSEMBLE_REDUCTION_MATRIX=1)
 
+target_compile_definitions(gtda_ripser_coeff PRIVATE USE_COEFFICIENTS=1 ASSEMBLE_REDUCTION_MATRIX=1)
 target_include_directories(gtda_ripser_coeff PRIVATE "${RIPSER_SRC_DIR}/ripser")
 
 if(MSVC)
@@ -58,6 +62,8 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_wasserstein ${BINDINGS_DIR}/wasserstein_bindings.cpp)
+set_property(TARGET gtda_wasserstein PROPERTY CXX_STANDARD 14)
+
 target_link_libraries(gtda_wasserstein LINK_PUBLIC ${Boost_LIBRARIES})
 target_compile_definitions(gtda_wasserstein PRIVATE BOOST_RESULT_OF_USE_DECLTYPE=1 BOOST_ALL_NO_LIB=1 BOOST_SYSTEM_NO_DEPRECATED=1)
 
@@ -77,6 +83,8 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_bottleneck "${BINDINGS_DIR}/bottleneck_bindings.cpp")
+set_property(TARGET gtda_bottleneck PROPERTY CXX_STANDARD 14)
+
 target_link_libraries(gtda_bottleneck LINK_PUBLIC ${Boost_LIBRARIES})
 target_compile_definitions(gtda_bottleneck PRIVATE BOOST_RESULT_OF_USE_DECLTYPE=1 BOOST_ALL_NO_LIB=1 BOOST_SYSTEM_NO_DEPRECATED=1)
 
@@ -96,6 +104,7 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_cubical_complex "${BINDINGS_DIR}/cubical_complex_bindings.cpp")
+set_property(TARGET gtda_cubical_complex PROPERTY CXX_STANDARD 14)
 
 if(OpenMP_FOUND)
   target_link_libraries(gtda_cubical_complex PRIVATE OpenMP::OpenMP_CXX)
@@ -120,6 +129,7 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_persistent_cohomology "${BINDINGS_DIR}/persistent_cohomology_bindings.cpp")
+set_property(TARGET gtda_persistent_cohomology PROPERTY CXX_STANDARD 14)
 
 if(OpenMP_FOUND)
   target_link_libraries(gtda_persistent_cohomology PRIVATE OpenMP::OpenMP_CXX)
@@ -146,6 +156,7 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_simplex_tree "${BINDINGS_DIR}/simplex_tree_bindings.cpp")
+set_property(TARGET gtda_simplex_tree PROPERTY CXX_STANDARD 14)
 
 if(OpenMP_FOUND)
     target_link_libraries(gtda_simplex_tree PRIVATE OpenMP::OpenMP_CXX)
@@ -174,6 +185,7 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_periodic_cubical_complex "${BINDINGS_DIR}/periodic_cubical_complex_bindings.cpp")
+set_property(TARGET gtda_periodic_cubical_complex PROPERTY CXX_STANDARD 14)
 
 if(OpenMP_FOUND)
     target_link_libraries(gtda_periodic_cubical_complex PRIVATE OpenMP::OpenMP_CXX)
@@ -200,6 +212,7 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_witness_complex "${BINDINGS_DIR}/witness_complex_bindings.cpp")
+set_property(TARGET gtda_witness_complex PROPERTY CXX_STANDARD 14)
 
 if(OpenMP_FOUND)
     target_link_libraries(gtda_witness_complex PRIVATE OpenMP::OpenMP_CXX)
@@ -228,6 +241,7 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_strong_witness_complex "${BINDINGS_DIR}/strong_witness_complex_bindings.cpp")
+set_property(TARGET gtda_strong_witness_complex PROPERTY CXX_STANDARD 14)
 
 if(OpenMP_FOUND)
     target_link_libraries(gtda_strong_witness_complex PRIVATE OpenMP::OpenMP_CXX)
@@ -256,6 +270,7 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_sparse_rips_complex "${BINDINGS_DIR}/rips_complex_bindings.cpp")
+set_property(TARGET gtda_sparse_rips_complex PROPERTY CXX_STANDARD 14)
 
 if(OpenMP_FOUND)
     target_link_libraries(gtda_sparse_rips_complex PRIVATE OpenMP::OpenMP_CXX)
@@ -285,6 +300,7 @@ endif()
 #######################################################################
 
 pybind11_add_module(gtda_cech_complex "${BINDINGS_DIR}/cech_complex_bindings.cpp")
+set_property(TARGET gtda_cech_complex PROPERTY CXX_STANDARD 14)
 
 if(OpenMP_FOUND)
     target_link_libraries(gtda_cech_complex PRIVATE OpenMP::OpenMP_CXX)

azure-pipelines.yml

@@ -38,7 +38,7 @@ jobs:
 
   - task: Cache@2
     inputs:
-      key: '"ccache-wheels-v2020.04.07" | $(Agent.OS) | "$(python.version)"'
+      key: '"ccache-wheels-v2020.05.12" | $(Agent.OS) | "$(python.version)"'
       path: $(CCACHE_DIR)
     displayName: ccache
 
@@ -133,7 +133,7 @@ jobs:
 
   - task: Cache@2
     inputs:
-      key: '"ccache-v2020.04.07" | $(Agent.OS) | "$(python.version)"'
+      key: '"ccache-v2020.05.12" | $(Agent.OS) | "$(python.version)"'
       path: $(CCACHE_DIR)
     displayName: ccache
 

gtda/mapper/tests/test_visualization.py

@@ -89,7 +89,7 @@ def test_cluster_sizes(self):
                           ['_data'][1]['hovertext']]
 
         g = pipe.fit_transform(X)
-        node_size_real = [len(l)
-                          for l in g['node_metadata']['node_elements']]
+        node_size_real = [len(node)
+                          for node in g['node_metadata']['node_elements']]
 
         assert sum(node_sizes_vis) == sum(node_size_real)