Merge remote-tracking branch 'app4triqs-remote/unstable'

Author: Wentzell

.github/workflows/build.yml

@@ -26,10 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {os: ubuntu-24.04, cc: gcc, cxx: g++, doc: OFF}
-          - {os: ubuntu-24.04, cc: clang, cxx: clang++, doc: ON}
-          #- {os: macos-14, cc: gcc-14, cxx: g++-14, doc: OFF}
-          #- {os: macos-14, cc: clang, cxx: clang++, doc: OFF}
+          - {os: ubuntu-24.04, cxx: g++, doc: OFF}
+          - {os: ubuntu-24.04, cxx: clang++, doc: ON}
 
     runs-on: ${{ matrix.os }}
 
@@ -39,9 +37,17 @@ jobs:
     - uses: actions/cache/restore@v4
       with:
         path: ${{ env.CCACHE_DIR }}
-        key: ccache-${{ matrix.os }}-${{ matrix.cc }}-${{ github.run_id }}
-        restore-keys:
-          ccache-${{ matrix.os }}-${{ matrix.cc }}-
+        key: ccache-${{ matrix.os }}-${{ matrix.cxx }}-${{ github.run_id }}-${{ github.run_attempt }}
+        restore-keys: |
+          ccache-${{ matrix.os }}-${{ matrix.cxx }}-
+
+    - name: Set cxx variables
+      run: |
+        if [[ ${{ matrix.os }} == 'macos-15' && ${{ matrix.cxx }} == 'g++' ]]; then
+          echo "CXX=g++-15" >> $GITHUB_ENV
+        else
+          echo "CXX=${{ matrix.cxx }}" >> $GITHUB_ENV
+        fi
 
     - name: Install ubuntu dependencies
       if: ${{ contains(matrix.os, 'ubuntu') }}
@@ -50,15 +56,18 @@ jobs:
         sudo apt-get install lsb-release wget software-properties-common &&
         sudo apt-get install
         ccache
+        cmake
+        ninja-build
         clang
+        clang-tools
         g++
         hdf5-tools
         libblas-dev
         libc++-dev
         libc++abi-dev
         libomp-dev
         libhdf5-dev
-        liblapack-dev
+        libopenblas-dev
         libopenmpi-dev
         openmpi-bin
         openmpi-common
@@ -75,7 +84,7 @@ jobs:
 
     - name: Set up virtualenv
       run: |
-        mkdir $HOME/.venv
+        mkdir -p $HOME/.venv
         python3 -m venv --system-site-packages $HOME/.venv/my_python
         source $HOME/.venv/my_python/bin/activate
         echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV
@@ -86,23 +95,19 @@ jobs:
       run: |
         brew update
         brew install ccache gcc llvm hdf5 open-mpi openblas
-        pip install mako
         echo "PATH=$(brew --prefix llvm)/bin:$(brew --prefix gcc)/bin:$PATH" >> $GITHUB_ENV
-        echo "PYTHONPATH=$(brew --prefix llvm)/lib/python3.13/site-packages" >> $GITHUB_ENV
+        echo "SDKROOT=$(xcrun --show-sdk-path)" >> $GITHUB_ENV
+        echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L/opt/homebrew/opt/llvm/lib/unwind -lunwind" >> $GITHUB_ENV
 
     - name: Add clang CXXFLAGS
-      if: ${{ contains(matrix.cxx, 'clang') }}
+      if: ${{ matrix.cxx == 'clang++' }}
       run: |
         echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
 
     - name: Build cppdlr
-      env:
-        CC: ${{ matrix.cc }}
-        CXX: ${{ matrix.cxx }}
-        TRIQS_BRANCH: ${{ github.event_name == 'pull_request' && github.base_ref || github.ref_name }}
       run: |
-        mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/install -DBuild_Documentation=${{ matrix.doc }}
-        make -j2 || make -j1 VERBOSE=1
+        cmake -S . -B build -G Ninja -DCMAKE_INSTALL_PREFIX=$HOME/install -DBuild_Documentation=${{ matrix.doc }}
+        cmake --build build --verbose
 
     - name: Test cppdlr
       env:
@@ -119,7 +124,7 @@ jobs:
       if: always()
       with:
         path: ${{ env.CCACHE_DIR }}
-        key: ccache-${{ matrix.os }}-${{ matrix.cc }}-${{ github.run_id }}
+        key: ccache-${{ matrix.os }}-${{ matrix.cxx }}-${{ github.run_id }}-${{ github.run_attempt }}
 
     - name: Deploy documentation to website
       if: matrix.doc == 'ON' && github.event_name == 'push'

.gitignore

@@ -1,2 +1,3 @@
 compile_commands.json
 doc/cpp2rst_generated
+.claude

c++/cppdlr/CMakeLists.txt

@@ -13,6 +13,8 @@ set_target_properties(${PROJECT_NAME}_c PROPERTIES
 )
 target_include_directories(${PROJECT_NAME}_c PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/c++>)
 target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
+target_link_directories(${PROJECT_NAME}_c PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/c++>)
+target_link_directories(${PROJECT_NAME}_c INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_LIBDIR}>)
 target_compile_definitions(${PROJECT_NAME}_c PUBLIC
 				CPPDLR_GIT_HASH=${PROJECT_GIT_HASH}
 				$<$<CONFIG:Debug>:CPPDLR_DEBUG>

doc/conf.py.in

@@ -82,6 +82,11 @@ htmlhelp_basename = '@PROJECT_NAME@doc'
 
 intersphinx_mapping = {'python': ('https://docs.python.org/3.8', None)}
 
+# numpydoc options
+numpydoc_show_class_members = False
+numpydoc_show_inherited_class_members = False
+numpydoc_class_members_toctree = False
+
 # open links in new tab instead of same window
 from sphinx.writers.html import HTMLTranslator
 from docutils import nodes

share/cmake/extract_flags.cmake

@@ -92,6 +92,11 @@ macro(extract_flags)
     endif()
   endforeach()
 
+  get_property_recursive(libdirs TARGET ${target} PROPERTY INTERFACE_LINK_DIRECTORIES)
+  foreach(dir ${libdirs})
+    set(${target}_LDFLAGS "${${target}_LDFLAGS} -L${dir}")
+  endforeach()
+
   # ==== We have to replace generator expressions explicitly ====
 
   if(ARG_BUILD_INTERFACE)
@@ -114,8 +119,12 @@ macro(extract_flags)
   endif()
 
   # Remove all remaining generator expressions
-  string(REGEX REPLACE " [^ ]*\\$<[^ ]*:[^>]*>" "" ${target}_LDFLAGS "${${target}_LDFLAGS}")
-  string(REGEX REPLACE " [^ ]*\\$<[^ ]*:[^>]*>" "" ${target}_CXXFLAGS "${${target}_CXXFLAGS}")
+  string(REGEX REPLACE " [^ ]*\\$<[^ ]*:[^ ]*>" "" ${target}_LDFLAGS "${${target}_LDFLAGS}")
+  string(REGEX REPLACE " [^ ]*\\$<[^ ]*:[^ ]*>" "" ${target}_CXXFLAGS "${${target}_CXXFLAGS}")
+
+  # Filter out ::@ expressions
+  string(REGEX REPLACE "::@[^ ]* " "" ${target}_LDFLAGS "${${target}_LDFLAGS}")
+  string(REGEX REPLACE "::@[^ ]* " "" ${target}_CXXFLAGS "${${target}_CXXFLAGS}")
 
   # Filter out system directories from LDFLAGS and CXXFLAGS
   string(REGEX REPLACE " -L/usr/lib " " " ${target}_LDFLAGS "${${target}_LDFLAGS}")