Skip to content

Commit 17f6146

Browse files
committed
Remove echo from kokkos SConscript
Seems a bug in Makefile.kokkos print-cxx-flags on Azure
1 parent f6b5910 commit 17f6146

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

simtbx/kokkos/SConscript

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ list_cfg = []
4747

4848
cfg_corigpu = cfg_default.get_copy()
4949
cfg_corigpu.host_variable = 'NERSC_HOST'
50-
cfg_corigpu.host_name = 'cori'
50+
cfg_corigpu.host_name = 'cori'
5151
cfg_corigpu.env['KOKKOS_DEVICES'] = "Cuda"
5252
cfg_corigpu.env['KOKKOS_ARCH'] = "Volta70"
5353
cfg_corigpu.env['KOKKOS_CUDA_OPTIONS'] = "enable_lambda,force_uvm"
@@ -141,6 +141,8 @@ kokkos_cxxflags = subprocess.check_output(
141141
cwd=os.environ['KOKKOS_PATH'])
142142
kokkos_cxxflags = kokkos_cxxflags.split(b'\n')
143143
kokkos_cxxflags = kokkos_cxxflags[1].decode('utf8').split()
144+
if kokkos_cxxflags and kokkos_cxxflags[0] == 'echo':
145+
kokkos_cxxflags = [f.strip('"' for f in kokkos_cxxflags[1:])]
144146
print('KOKKOS_CXXFLAGS:', kokkos_cxxflags)
145147
print('='*79)
146148

@@ -179,9 +181,6 @@ if not env_etc.no_boost_python:
179181
kokkos_ext_env.Prepend(CXXFLAGS=['-DCUDAREAL=double'] + kokkos_cxxflags)
180182
kokkos_ext_env.Prepend(CPPFLAGS=['-DCUDAREAL=double'] + kokkos_cxxflags)
181183
kokkos_ext_env.Prepend(CPPPATH=[os.environ['KOKKOS_PATH']])
182-
print("DEBUG1", kokkos_cxxflags)
183-
print("DEBUG2", os.environ['KOKKOS_PATH'])
184-
print("DEBUG3", os.environ['SHELL'])
185184
default_libs = [
186185
"simtbx_kokkos",
187186
"scitbx_boost_python",

0 commit comments

Comments
 (0)