Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
af6b0fc
Make CppInterOp llvm 21 compatible
mcbarton Jul 15, 2025
3d74a26
Update Windows-emscripten-clang21-1-CrossCompile.patch
mcbarton Jul 15, 2025
aef6370
Update exports.ld
mcbarton Jul 16, 2025
2a280d1
Update exports.ld
mcbarton Jul 16, 2025
8c81b18
Merge branch 'main' into Add-llvm-21-support
mcbarton Aug 31, 2025
bbd2a48
Define Print_Canonical_Types for llvm 21 compatibility
mcbarton Sep 9, 2025
f8c7163
Merge branch 'main' into Add-llvm-21-support
mcbarton Sep 9, 2025
68a3695
Make CppInterOp llvm 21 compatible
mcbarton Jul 15, 2025
a6919e7
Update Windows-emscripten-clang21-1-CrossCompile.patch
mcbarton Jul 15, 2025
a4801b4
Update exports.ld
mcbarton Jul 16, 2025
113b7a6
Update exports.ld
mcbarton Jul 16, 2025
ed5b80c
Define Print_Canonical_Types for llvm 21 compatibility
mcbarton Sep 9, 2025
19e1951
fix instantiation of templated class
Vipul-Cariappa Sep 15, 2025
eaf352c
fix instantiation of templated class
Vipul-Cariappa Sep 15, 2025
71f02da
Merge branch 'Add-llvm-21-support' into mcbarton/Add-llvm-21-support
Vipul-Cariappa Sep 15, 2025
a884dee
Merge pull request #1 from Vipul-Cariappa/mcbarton/Add-llvm-21-support
mcbarton Sep 15, 2025
c6fb53f
Merge branch 'main' into Add-llvm-21-support
mcbarton Sep 15, 2025
bbbf6d0
Apply some PR comments
mcbarton Sep 15, 2025
c97eb37
Updat 1.x to 21.x readme.md
mcbarton Sep 15, 2025
541711e
Update rest of docs for llvm 21
mcbarton Sep 15, 2025
7e1bd6e
Merge branch 'main' into Add-llvm-21-support
mcbarton Sep 24, 2025
77ee1d0
Merge branch 'main' into Add-llvm-21-support
mcbarton Oct 21, 2025
8301e7a
Add llvm 21 Emscripten exception handling patch
mcbarton Nov 3, 2025
677a033
Merge branch 'main' into Add-llvm-21-support
mcbarton Nov 3, 2025
e3539e8
Remove trailing whitespace in patch
mcbarton Nov 3, 2025
53c7971
Fix Emscripten build
mcbarton Nov 4, 2025
69cc9f4
Merge branch 'main' into Add-llvm-21-support
mcbarton Nov 4, 2025
e7807c4
Only apply oop patch for llvm 20
mcbarton Nov 4, 2025
3d3dc5e
Update main.yml
mcbarton Nov 4, 2025
125daf8
Fix Emscripten shared library size llvm 21
mcbarton Nov 4, 2025
6b3e1c0
Revert "Fix Emscripten shared library size llvm 21"
mcbarton Nov 4, 2025
a4dc596
Remove Windows llvm 20 jobs
mcbarton Nov 5, 2025
63249d7
Update emscripten.yml
mcbarton Nov 12, 2025
7057bb4
Build cppyy on Windows for llvm 21
mcbarton Dec 2, 2025
a6e254e
Merge branch 'CppInterOp-main' into Windows-shared-library-new-2
mcbarton Dec 2, 2025
42ac783
Update action.yml
mcbarton Dec 2, 2025
0a747d9
Update main.yml
mcbarton Dec 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/actions/Build_LLVM/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ runs:
ninja LLVMOrcDebugging -j ${{ env.ncpus }}
ninja clingInterpreter -j ${{ env.ncpus }}
else
if [[ "${{ matrix.oop-jit }}" == "On" ]]; then
llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
if [[ "${{ matrix.oop-jit }}" == "On" && "${llvm_vers}" == "20" ]]; then
git apply -v ../patches/llvm/clang20-1-out-of-process.patch
echo "Apply clang20-1-out-of-process.patch:"
fi
Expand Down
8 changes: 4 additions & 4 deletions .github/actions/Build_and_Test_CppInterOp/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ runs:
}
else
{
$env:CPLUS_INCLUDE_PATH="$env:LLVM_DIR\llvm\include;$env:LLVM_DIR\clang\include;$env:LLVM_BUILD_DIR\include;$env:LLVM_BUILD_DIR\tools\clang\include;$env:PWD_DIR\include;"
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH"
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH" >> $env:GITHUB_ENV
$env:IncludePath="$env:IncludePath;$env:LLVM_DIR\llvm\include;$env:LLVM_DIR\clang\include;$env:LLVM_BUILD_DIR\include;$env:LLVM_BUILD_DIR\tools\clang\include;$env:PWD_DIR\include;"
echo "IncludePath=$env:IncludePath"
echo "IncludePath=$env:IncludePath" >> $env:GITHUB_ENV
}

$env:CB_PYTHON_DIR="$env:PWD_DIR\cppyy-backend\python"
Expand Down Expand Up @@ -142,7 +142,7 @@ runs:
{
cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
-DLLVM_ENABLE_WERROR=On `
-DLLVM_ENABLE_WERROR=On -DBUILD_SHARED_LIBS=ON `
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR" ..\
}
cmake --build . --config ${{ env.BUILD_TYPE }} --target check-cppinterop --parallel ${{ env.ncpus }}
92 changes: 92 additions & 0 deletions .github/actions/Build_and_Test_cppyy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,95 @@ runs:
tail -n1 test_xfailed.log
echo "Return Code: ${RETCODE}"
exit $RETCODE

- name: Build and Install cppyy-backend
if: ${{ matrix.cppyy == 'On' && runner.os == 'Windows' }}
shell: powershell
run: |
# Download cppyy-backend
git clone --depth=1 https://github.com/compiler-research/cppyy-backend.git
cd cppyy-backend
mkdir $env:CPPINTEROP_DIR\lib
mkdir build
cd build
# Install CppInterOp
cd $env:CPPINTEROP_BUILD_DIR
cmake --build . --target install --parallel ${{ env.ncpus }}
cd ..\cppyy-backend\build\
# Build and Install cppyy-backend
cmake -DCppInterOp_DIR=$env:CPPINTEROP_DIR -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} ..
cmake --build . --config ${{ env.BUILD_TYPE }} --parallel ${{ env.ncpus }}
cp Release\libcppyy-backend.dll $env:CPPINTEROP_DIR\lib\
cd ..
- name: Install CPyCppyy
if: ${{ matrix.cppyy == 'On' && runner.os == 'Windows' }}
shell: powershell
run: |
python -m venv .venv
. .\.venv\Scripts\Activate.ps1
# Install CPyCppyy
git clone --depth=1 https://github.com/compiler-research/CPyCppyy.git
mkdir CPyCppyy\build
cd CPyCppyy\build
cmake ..
cmake --build . --parallel ${{ env.ncpus }}
#
env:CPYCPPYY_DIR = $PWD.Path
cd ../..
# We need CPYCPPYY_DIR later
echo "CPYCPPYY_DIR=$env:CPYCPPYY_DIR" >> $env:GITHUB_ENV
- name: Install cppyy
if: ${{ matrix.cppyy == 'On' && runner.os == 'Windows' }}
shell: powershell
run: |
# source virtual environment
. .\.venv\Scripts\Activate.ps1
# Install cppyy
git clone --depth=1 https://github.com/compiler-research/cppyy.git
cd cppyy
python -m pip install --upgrade . --no-deps
cd ..
- name: Run cppyy
if: ${{ matrix.cppyy == 'On' && runner.os == 'Windows' }}
shell: powershell
run: |
# Run cppyy
. .\.venv\Scripts\Activate.ps1
$env:PYTHONPATH=$env:PYTHONPATH:$env:CPYCPPYY_DIR:$env:CB_PYTHON_DIR
python -c "import cppyy"
# We need PYTHONPATH later
echo "PYTHONPATH=$env:PYTHONPATH" >> $GITHUB_ENV
- name: Run the tests
if: ${{ matrix.cppyy == 'On' && runner.os == 'Windows' }}
shell: powershell
run: |
# Run the tests
. .\.venv\Scripts\Activate.ps1
cd cppyy\test
echo ::group::Prepare For Testing
make all
python -m pip install --upgrade pip
python -m pip install pytest
python -m pip install pytest-xdist
python -m pip install numba
echo ::endgroup::
echo ::group::Run complete test suite
$ErrorActionPreference = "Stop"
python -m pytest -sv -ra 2>&1 | Tee-Object -FilePath complete_testrun.log
$ErrorActionPreference = "Continue"
echo ::group::Crashing Test Logs
# See if we don't have a crash that went away
# Comment out all xfails but the ones that have a run=False condition.
find.exe . -name "*.py" -exec sed.exe -i '/run=False/!s/^ *@mark.xfail\(.*\)/#&/' {} \;
python -m pytest -n 1 -m "xfail" --runxfail -sv -ra --max-worker-restart 512 2>&1 | Tee-Object -FilePath test_crashed.log
$LASTEXITCODE = 0
git checkout .
echo ::endgroup::
echo ::group::XFAIL Test Logs
# Rewrite all xfails that have a run clause to skipif. This way we will
# avoid conditionally crashing xfails
find.exe . -name "*.py" -exec sed.exe -i -E 's/(^ *)@mark.xfail\(run=(.*)/\1@mark.skipif(condition=not \2/g' {} \;
# See if we don't have an xfail that went away
python -m pytest --runxfail -sv -ra | tee test_xfailed.log 2>&1 || true
git checkout .
echo ::endgroup::
50 changes: 0 additions & 50 deletions .github/workflows/clang-format.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/clang-tidy-review-post.yml

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/clang-tidy-review.yml

This file was deleted.

Loading
Loading