Skip to content

Commit dcbf2ec

Browse files
authored
Merge pull request #330 from Sichao25/yus/code_wo_ref
Replace omega_h functions in Python API with PyOmega_h
2 parents 148cd94 + ec95a2a commit dcbf2ec

11 files changed

Lines changed: 123 additions & 908 deletions

.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
with:
9090
repo-name: 'omega_h-openmpi'
9191
repo-path: 'SCOREC/omega_h'
92-
repo-ref: '1765836a00b9a64b8b3791f1442ac52f147e43b2'
92+
repo-ref: '2b2e778472f48a85a5ff5e70083e3a415e58be72'
9393
cache: true
9494
options: '-DCMAKE_CXX_COMPILER=`which mpicxx`
9595
-DCMAKE_C_COMPILER=`which mpicc`

.github/workflows/cmake-test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,14 @@ jobs:
112112
with:
113113
repo-name: 'omega_h'
114114
repo-path: 'SCOREC/omega_h'
115-
repo-ref: '1765836a00b9a64b8b3791f1442ac52f147e43b2'
115+
repo-ref: '2b2e778472f48a85a5ff5e70083e3a415e58be72'
116116
cache: true
117117
cache-suffix: ${{ matrix.python_api == 'ON' && '-shared' || '' }}
118118
options: '-DCMAKE_CXX_COMPILER=`which mpicxx`
119119
-DCMAKE_C_COMPILER=`which mpicc`
120+
-DCMAKE_BUILD_TYPE="RelWithDebInfo"
120121
-DBUILD_SHARED_LIBS=${{ matrix.python_api }}
122+
-DOmega_h_USE_pybind11=${{ matrix.python_api }}
121123
-DOmega_h_USE_MPI=ON
122124
-DOmega_h_USE_Kokkos=ON
123125
-DBUILD_TESTING=OFF
@@ -281,6 +283,7 @@ jobs:
281283
if: matrix.python_api == 'ON'
282284
run: |
283285
export PYTHONPATH=${{ runner.temp }}/build-pcms/install/lib/python3.12/site-packages:$PYTHONPATH
286+
export PYTHONPATH=${{ runner.temp }}/build-omega_h/install/lib/python/dist-packages:$PYTHONPATH
284287
cd ${{ github.workspace }}/src/pcms/pythonapi
285288
python3 test_file_io.py
286289
python3 test_omega_h_field.py

src/pcms/pythonapi/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pybind11_add_module(pcms
1010
bind_omega_h_field_layout.cpp
1111
bind_uniform_grid_field.cpp
1212
bind_uniform_grid_field_layout.cpp
13-
bind_omega_h.cpp
1413
bind_transfer_field.cpp
1514
bind_mls_interpolation.cpp
1615
bind_mesh_utilities.cpp

0 commit comments

Comments
 (0)