Skip to content

Commit 23f5415

Browse files
committed
roll back attempts and add memory adress print
1 parent bca6cc3 commit 23f5415

File tree

5 files changed

+12
-34
lines changed

5 files changed

+12
-34
lines changed

.github/workflows/conda_build.yaml

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -57,39 +57,9 @@ jobs:
5757
- name: Setup Conda
5858
run: conda install -y -c conda-forge boa anaconda-client ninja
5959

60-
- name: Install Ninja
61-
uses: seanmiddleditch/gha-setup-ninja@v3
62-
63-
- name: Configure MSVC environment
64-
uses: ilammy/msvc-dev-cmd@v1
65-
66-
- name: Set CMAKE_GENERATOR env var
67-
run: echo "CMAKE_GENERATOR=Ninja" >> $env:GITHUB_ENV
68-
69-
- name: CMake Generation - MSVC
70-
shell: cmd
71-
run: cmake -B build -DCMAKE_C_COMPILER_LAUNCHER=${{ github.workspace }}/buildcache/bin/buildcache.exe -DCMAKE_CXX_COMPILER_LAUNCHER=${{ github.workspace }}/buildcache/bin/buildcache.exe ${{ github.workspace }}/LyceanEM-Python
72-
73-
- name: Build Project
74-
shell: cmd
75-
run: |
76-
set CL=/MP
77-
cmake --build build -j 2
78-
79-
80-
- name: Build Conda package using mamba build
81-
run:
82-
conda mambabuild ${{ github.workspace }}/LyceanEM-Python/conda/
83-
84-
85-
8660
#
87-
88-
#
89-
- name: Build Conda package using mamba build linux
90-
if: runner.os == 'linux'
91-
run:
92-
conda mambabuild ${{ github.workspace }}/LyceanEM-Python/conda/
61+
- name: Build Conda package using mamba build
62+
run: conda mambabuild ${{ github.workspace }}/LyceanEM-Python/conda/
9363
#
9464

9565
#

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ find_package(Python REQUIRED COMPONENTS Interpreter Development.Module)
33
message(STATUS "Python_version: ${Python_VERSION}")
44
find_package(pybind11 CONFIG REQUIRED)
55
project(test LANGUAGES CXX CUDA)
6+
## set the generator
7+
set(CMAKE_GENERATOR "Ninja")
68

79

810
find_package( PkgConfig )

conda/meta.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ source:
66

77

88
build:
9-
script: {{ PYTHON }} setup.py install
9+
script_env:
10+
- CMAKE_GENERATOR=Ninja
11+
script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv --force-cmake
1012

1113
requirements:
1214
build:

lyceanem/src/frequency_domain_models.cu

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@ py::array_t<float> calculate_scattering_tiles(py::array_t<float> source, py::arr
174174

175175
scattering_network_py_ptr[base + 4] = scattering_network_ptr[i].z.x;
176176
scattering_network_py_ptr[base + 5] = scattering_network_ptr[i].z.y;
177+
178+
}
179+
for (int i = 0; i < source_size * end_size * 3 * 2; i++) {
180+
std::cout << scattering_network_py_ptr[i] << " " << "location " << &scattering_network_py_ptr[i] << std::endl;
181+
177182
}
178183
cudaFree(d_binned_triangles);
179184
cudaFree(d_bin_count);

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ write_to = "lyceanem/_version.py"
66
[tool.scikit-build]
77
build-dir = "build"
88
cmake.minimum-version = "3.22"
9-
cmake.generator = "Ninja"

0 commit comments

Comments
 (0)