Compare commits
4 Commits
psakievich
...
fix/troubl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
020c06c696 | ||
|
|
30f811588d | ||
|
|
896d7cf497 | ||
|
|
75530be48a |
@@ -472,6 +472,7 @@ def compiler_verbose_output(self) -> Optional[str]:
|
||||
"""Verbose output from compiling a dummy C source file. Output is cached."""
|
||||
if not hasattr(self, "_compile_c_source_output"):
|
||||
self._compile_c_source_output = self._compile_dummy_c_source()
|
||||
print(self._compile_c_source_output)
|
||||
return self._compile_c_source_output
|
||||
|
||||
def _compile_dummy_c_source(self) -> Optional[str]:
|
||||
@@ -494,9 +495,6 @@ def _compile_dummy_c_source(self) -> Optional[str]:
|
||||
|
||||
with self.compiler_environment():
|
||||
return cc_exe(self.verbose_flag, fin, "-o", fout, output=str, error=str)
|
||||
except spack.util.executable.ProcessError as pe:
|
||||
tty.debug("ProcessError: Command exited with non-zero status: " + pe.long_message)
|
||||
return None
|
||||
finally:
|
||||
shutil.rmtree(tmpdir, ignore_errors=True)
|
||||
|
||||
|
||||
@@ -2390,11 +2390,6 @@ def setup(
|
||||
|
||||
self.gen.h1("Reusable concrete specs")
|
||||
self.define_concrete_input_specs(specs, self.pkgs)
|
||||
# TODO: make a config option for this undocumented feature
|
||||
checksummed = "SPACK_CONCRETIZER_REQUIRE_CHECKSUM" in os.environ
|
||||
self.define_ad_hoc_versions_from_specs(
|
||||
specs, Provenance.SPEC, allow_deprecated=allow_deprecated, require_checksum=checksummed
|
||||
)
|
||||
if reuse:
|
||||
self.gen.fact(fn.optimize_for_reuse())
|
||||
for reusable_spec in reuse:
|
||||
@@ -2426,9 +2421,14 @@ def setup(
|
||||
self.provider_requirements()
|
||||
self.external_packages()
|
||||
|
||||
# TODO: make a config option for this undocumented feature
|
||||
checksummed = "SPACK_CONCRETIZER_REQUIRE_CHECKSUM" in os.environ
|
||||
self.define_package_versions_and_validate_preferences(
|
||||
self.pkgs, allow_deprecated=allow_deprecated, require_checksum=checksummed
|
||||
)
|
||||
self.define_ad_hoc_versions_from_specs(
|
||||
specs, Provenance.SPEC, allow_deprecated=allow_deprecated, require_checksum=checksummed
|
||||
)
|
||||
self.define_ad_hoc_versions_from_specs(
|
||||
dev_specs,
|
||||
Provenance.DEV_SPEC,
|
||||
|
||||
@@ -126,7 +126,7 @@ spack:
|
||||
prefix: /opt/rocm-5.7.1
|
||||
extra_attributes:
|
||||
compilers:
|
||||
c: /opt/rocm-5.7.1/llvm/bin/clang++
|
||||
c: /opt/rocm-5.7.1/llvm/bin/clang
|
||||
c++: /opt/rocm-5.7.1/llvm/bin/clang++
|
||||
hip: /opt/rocm-5.7.1/hip/bin/hipcc
|
||||
hipify-clang:
|
||||
@@ -141,7 +141,7 @@ spack:
|
||||
prefix: /opt/rocm-5.7.1/llvm
|
||||
extra_attributes:
|
||||
compilers:
|
||||
c: /opt/rocm-5.7.1/llvm/bin/clang++
|
||||
c: /opt/rocm-5.7.1/llvm/bin/clang
|
||||
cxx: /opt/rocm-5.7.1/llvm/bin/clang++
|
||||
hsakmt-roct:
|
||||
buildable: false
|
||||
|
||||
Reference in New Issue
Block a user