Create a C++-only version of the app4triqs skeleton

Wentzell · Wentzell · commit fad8bde8d24d · 2020-08-10T12:05:54.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,9 +62,6 @@ if(NOT IS_SUBPROJECT)
   message(STATUS "-------- BUILD-TYPE: ${CMAKE_BUILD_TYPE} --------")
 endif()
 
-# Python Support
-option(PythonSupport "Build with Python support" ON)
-
 # Documentation
 option(Build_Documentation "Build documentation" OFF)
 
@@ -131,11 +128,6 @@ if(Build_Tests)
   add_subdirectory(test)
 endif()
 
-# Python
-if(PythonSupport)
-  add_subdirectory(python/${PROJECT_NAME})
-endif()
-
 # Docs
 if(Build_Documentation)
   add_subdirectory(doc)
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ To adapt this skeleton for a new TRIQS application, the following steps are nece
 * Run the following commands in order after replacing **appname** accordingly
 
 ```bash
-git clone https://github.com/triqs/app4triqs --branch unstable appname
+git clone https://github.com/triqs/app4triqs --branch cpp_only appname
 cd appname
 ./share/squash_history.sh
 ./share/replace_and_rename.py appname
@@ -36,7 +36,7 @@ You can merge future changes to the app4triqs skeleton into your project with th
 
 ```bash
 git remote update
-git merge app4triqs_remote/unstable -m "Merge latest app4triqs skeleton changes"
+git merge app4triqs_remote/cpp_only -m "Merge latest app4triqs skeleton changes"
 ```
 
 If you should encounter any conflicts resolve them and `git commit`.
@@ -56,9 +56,6 @@ according to your needs (replace app4triqs in the following by the name of your
 * Adjust or remove the `README.md` and `doc/ChangeLog.md` file
 * In the `c++/app4triqs` subdirectory adjust the example files `app4triqs.hpp` and `app4triqs.cpp` or add your own source files.
 * In the `test/c++` subdirectory adjust the example test `basic.cpp` or add your own tests.
-* In the `python/app4triqs` subdirectory add your Python source files.
-  Be sure to remove the `app4triqs_module_desc.py` file unless you want to generate a Python module from your C++ source code.
-* In the `test/python` subdirectory adjust the example test `Basic.py` or add your own tests.
 * Adjust any documentation examples given as `*.rst` files in the doc directory.
 * Adjust the sphinx configuration in `doc/conf.py.in` as necessary.
 * The build and install process is identical to the one outline [here](https://triqs.github.io/app4triqs/unstable/install.html).
diff --git a/c++/app4triqs/app4triqs.cpp b/c++/app4triqs/app4triqs.cpp
@@ -19,7 +19,7 @@ namespace app4triqs {
   void h5_write(h5::group grp, std::string subgroup_name, toto const &m) {
     grp = subgroup_name.empty() ? grp : grp.create_group(subgroup_name);
     h5_write(grp, "i", m.i);
-    h5_write_attribute(grp, "TRIQS_HDF5_data_scheme", toto::hdf5_format());
+    h5_write_attribute(grp, "Format", toto::hdf5_format());
   }
 
   void h5_read(h5::group grp, std::string subgroup_name, toto &m) {
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -48,7 +48,7 @@ else()
 endif()
 
 # -- Cpp2Py --
-if(PythonSupport OR Build_Documentation)
+if(Build_Documentation)
   external_dependency(Cpp2Py
     GIT_REPO https://github.com/TRIQS/cpp2py
     VERSION 2.0
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -60,12 +60,6 @@ add_custom_command(
 
 option(Sphinx_Only "When building the documentation, skip the Python Modules and the generation of C++ Api and example outputs" OFF)
 if(NOT Sphinx_Only)
-  # Autodoc usage requires the python modules to be built first
-  get_property(CPP2PY_MODULES_LIST GLOBAL PROPERTY CPP2PY_MODULES_LIST)
-  if(CPP2PY_MODULES_LIST)
-    add_dependencies(${PROJECT_NAME}_docs_sphinx ${CPP2PY_MODULES_LIST})
-  endif()
-
   # Generation of C++ Api and Example Outputs
   add_dependencies(${PROJECT_NAME}_docs_sphinx ${PROJECT_NAME}_docs_cpp2rst ${PROJECT_NAME}_docs_example_output)
 endif()
diff --git a/doc/documentation.rst b/doc/documentation.rst
@@ -28,14 +28,3 @@ C++ reference manual
    :maxdepth: 5
 
    cpp2rst_generated/contents
-
-Python reference manual
------------------------
-
-.. automodule:: app4triqs 
-   :members:
-
-.. autoclass:: app4triqs.app4triqs_module.Toto
-   :members:
-
-.. autofunction:: app4triqs.app4triqs_module.chain
diff --git a/packaging/conda/build.sh b/packaging/conda/build.sh
@@ -10,6 +10,8 @@ export OMPI_MCA_rmaps_base_oversubscribe=yes
 export OMPI_MCA_btl_vader_single_copy_mechanism=none
 mpiexec="mpiexec --allow-run-as-root"
 
+source $PREFIX/share/triqsvars.sh
+
 cmake \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/packaging/conda/meta.yaml b/packaging/conda/meta.yaml
@@ -19,12 +19,16 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
   host:
+    - triqs {{ '.'.join(version.split('.')[:2]) }}
+    - boost-cpp
     - hdf5
     - {{ mpi }}
     - libblas
     - liblapack
     - python
   run:
+    - {{ pin_compatible("triqs", max_pin="x.x") }}
+    - boost-cpp
     - hdf5
     - {{ mpi }}
     - libblas
diff --git a/python/app4triqs/CMakeLists.txt b/python/app4triqs/CMakeLists.txt
diff --git a/python/app4triqs/__init__.py b/python/app4triqs/__init__.py
diff --git a/python/app4triqs/app4triqs_module_desc.py b/python/app4triqs/app4triqs_module_desc.py
diff --git a/python/app4triqs/version.py.in b/python/app4triqs/version.py.in
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
@@ -2,11 +2,6 @@ add_subdirectory(cmake)
 
 if(NOT IS_SUBPROJECT)
 
-  if(PythonSupport)
-    set(EXPORT_PYTHON_PATH "export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CPP2PY_PYTHON_LIB_DEST_ROOT}:$PYTHONPATH")
-    set(MODFILE_PYTHON_PATH "prepend-path    PYTHONPATH          $root/${CPP2PY_PYTHON_LIB_DEST_ROOT}")
-  endif()
-
   configure_file(${PROJECT_NAME}.modulefile.in ${PROJECT_NAME}.modulefile @ONLY)
   configure_file(${PROJECT_NAME}vars.sh.in ${PROJECT_NAME}vars.sh @ONLY)
 
diff --git a/share/app4triqs.modulefile.in b/share/app4triqs.modulefile.in
@@ -32,4 +32,3 @@ prepend-path    CPLUS_INCLUDE_PATH  $root/include
 prepend-path    LIBRARY_PATH        $root/lib
 prepend-path    LD_LIBRARY_PATH     $root/lib
 prepend-path    CMAKE_PREFIX_PATH   $root
-@MODFILE_PYTHON_PATH@
diff --git a/share/app4triqsvars.sh.in b/share/app4triqsvars.sh.in
@@ -7,4 +7,3 @@ export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH
 export LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LIBRARY_PATH 
 export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH 
 export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@:$CMAKE_PREFIX_PATH
-@EXPORT_PYTHON_PATH@
diff --git a/share/cmake/app4triqs-config.cmake.in b/share/cmake/app4triqs-config.cmake.in
@@ -31,7 +31,4 @@ message(STATUS "Found @PROJECT_NAME@-config.cmake with version @PROJECT_VERSION@
 # Was the Project built with Documentation?
 set(@PROJECT_NAME@_WITH_DOCUMENTATION @Build_Documentation@ CACHE BOOL "Was @PROJECT_NAME@ build with documentation?")
 
-# Was the Project built with PythonSupport?
-set(@PROJECT_NAME@_WITH_PYTHON_SUPPORT @PythonSupport@ CACHE BOOL "Was @PROJECT_NAME@ build with python support?")
-
 endif()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,5 +1 @@
 add_subdirectory(c++)
-
-if(PythonSupport)
- add_subdirectory(python)
-endif()
diff --git a/test/python/Basic.py b/test/python/Basic.py
diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace app4triqs {`
`19`	`19`	`void h5_write(h5::group grp, std::string subgroup_name, toto const &m) {`
`20`	`20`	`grp = subgroup_name.empty() ? grp : grp.create_group(subgroup_name);`
`21`	`21`	`h5_write(grp, "i", m.i);`
`22`		`- h5_write_attribute(grp, "TRIQS_HDF5_data_scheme", toto::hdf5_format());`
	`22`	`+ h5_write_attribute(grp, "Format", toto::hdf5_format());`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`void h5_read(h5::group grp, std::string subgroup_name, toto &m) {`