diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2024-04-23 12:47:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-23 12:47:33 +0200 |
| commit | 01f61a2eba972f216ccb5b8cf815c0eab39557c7 (patch) | |
| tree | ad332a431582616561e5642eb6107a2f32c7fe95 /lib | |
| parent | 7d5e27d5e8232ce63c9d69ddd3bb733d4a18edf4 (diff) | |
| download | spack-01f61a2eba972f216ccb5b8cf815c0eab39557c7.tar.gz spack-01f61a2eba972f216ccb5b8cf815c0eab39557c7.tar.bz2 spack-01f61a2eba972f216ccb5b8cf815c0eab39557c7.tar.xz spack-01f61a2eba972f216ccb5b8cf815c0eab39557c7.zip | |
Remove import distro from packages and docs (#43772)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/docs/developer_guide.rst | 8 | ||||
| -rw-r--r-- | lib/spack/spack/build_systems/rocm.py | 24 |
2 files changed, 13 insertions, 19 deletions
diff --git a/lib/spack/docs/developer_guide.rst b/lib/spack/docs/developer_guide.rst index a87ed5f576..91550f795f 100644 --- a/lib/spack/docs/developer_guide.rst +++ b/lib/spack/docs/developer_guide.rst @@ -552,11 +552,11 @@ With either interpreter you can run a single command: .. code-block:: console - $ spack python -c 'import distro; distro.linux_distribution()' - ('Ubuntu', '18.04', 'Bionic Beaver') + $ spack python -c 'from spack.spec import Spec; Spec("python").concretized()' + ... - $ spack python -i ipython -c 'import distro; distro.linux_distribution()' - Out[1]: ('Ubuntu', '18.04', 'Bionic Beaver') + $ spack python -i ipython -c 'from spack.spec import Spec; Spec("python").concretized()' + Out[1]: ... or a file: diff --git a/lib/spack/spack/build_systems/rocm.py b/lib/spack/spack/build_systems/rocm.py index 440cab7fde..8094c90c2e 100644 --- a/lib/spack/spack/build_systems/rocm.py +++ b/lib/spack/spack/build_systems/rocm.py @@ -80,6 +80,7 @@ import os import spack.variant from spack.directives import conflicts, depends_on, variant from spack.package_base import PackageBase +from spack.util.environment import EnvironmentModifications class ROCmPackage(PackageBase): @@ -156,30 +157,23 @@ class ROCmPackage(PackageBase): archs = ",".join(amdgpu_target) return "--amdgpu-target={0}".format(archs) - # ASAN - @staticmethod - def asan_on(env, llvm_path): + def asan_on(self, env: EnvironmentModifications): + llvm_path = self.spec["llvm-amdgpu"].prefix env.set("CC", llvm_path + "/bin/clang") env.set("CXX", llvm_path + "/bin/clang++") env.set("ASAN_OPTIONS", "detect_leaks=0") - for root, dirs, files in os.walk(llvm_path): + for root, _, files in os.walk(llvm_path): if "libclang_rt.asan-x86_64.so" in files: asan_lib_path = root env.prepend_path("LD_LIBRARY_PATH", asan_lib_path) - SET_DWARF_VERSION_4 = "" - try: - # This will throw an error if imported on a non-Linux platform. - import distro - - distname = distro.id() - except ImportError: - distname = "unknown" - if "rhel" in distname or "sles" in distname: + if "rhel" in self.spec.os or "sles" in self.spec.os: SET_DWARF_VERSION_4 = "-gdwarf-5" + else: + SET_DWARF_VERSION_4 = "" - env.set("CFLAGS", "-fsanitize=address -shared-libasan -g " + SET_DWARF_VERSION_4) - env.set("CXXFLAGS", "-fsanitize=address -shared-libasan -g " + SET_DWARF_VERSION_4) + env.set("CFLAGS", f"-fsanitize=address -shared-libasan -g {SET_DWARF_VERSION_4}") + env.set("CXXFLAGS", f"-fsanitize=address -shared-libasan -g {SET_DWARF_VERSION_4}") env.set("LDFLAGS", "-Wl,--enable-new-dtags -fuse-ld=lld -fsanitize=address -g -Wl,") # HIP version vs Architecture |