Remove import distro from packages and docs (#43772)

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()'
+   $ spack python -c 'from spack.spec import Spec; Spec("python").concretized()'
-   ('Ubuntu', '18.04', 'Bionic Beaver')
+   ...
 
-   $ spack python -i ipython -c 'import distro; distro.linux_distribution()'
+   $ spack python -i ipython -c 'from spack.spec import Spec; Spec("python").concretized()'
-   Out[1]: ('Ubuntu', '18.04', 'Bionic Beaver')
+   Out[1]: ...
 
 or a file:
 

lib/spack/spack/build_systems/rocm.py

@@ -80,6 +80,7 @@
 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 @@ def hip_flags(amdgpu_target):
         archs = ",".join(amdgpu_target)
         return "--amdgpu-target={0}".format(archs)
 
-    # ASAN
+    def asan_on(self, env: EnvironmentModifications):
-    @staticmethod
+        llvm_path = self.spec["llvm-amdgpu"].prefix
-    def asan_on(env, llvm_path):
         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 = ""
+        if "rhel" in self.spec.os or "sles" in self.spec.os:
-        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:
             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("CFLAGS", f"-fsanitize=address -shared-libasan -g {SET_DWARF_VERSION_4}")
-        env.set("CXXFLAGS", "-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

var/spack/repos/builtin/packages/hip-tensor/package.py

@@ -31,4 +31,4 @@ class HipTensor(CMakePackage, ROCmPackage):
     def setup_build_environment(self, env):
         env.set("CXX", self.spec["hip"].hipcc)
         if self.spec.satisfies("+asan"):
-            self.asan_on(env, self.spec["llvm-amdgpu"].prefix)
+            self.asan_on(env)

var/spack/repos/builtin/packages/hipblas/package.py

@@ -117,7 +117,7 @@ def determine_version(cls, lib):
 
     def setup_build_environment(self, env):
         if self.spec.satisfies("+asan"):
-            self.asan_on(env, self.spec["llvm-amdgpu"].prefix)
+            self.asan_on(env)
 
     def cmake_args(self):
         args = [

var/spack/repos/builtin/packages/hipcub/package.py

@@ -89,7 +89,7 @@ def setup_build_environment(self, env):
         if self.spec.satisfies("+rocm"):
             env.set("CXX", self.spec["hip"].hipcc)
         if self.spec.satisfies("+asan"):
-            self.asan_on(env, self.spec["llvm-amdgpu"].prefix)
+            self.asan_on(env)
 
     def cmake_args(self):
         args = [self.define("BUILD_TEST", self.run_tests)]

var/spack/repos/builtin/packages/hipfft/package.py

@@ -94,7 +94,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
 
     def setup_build_environment(self, env):
         if self.spec.satisfies("+asan"):
-            self.asan_on(env, self.spec["llvm-amdgpu"].prefix)
+            self.asan_on(env)
 
     def cmake_args(self):
         args = [self.define("BUILD_CLIENTS_SAMPLES", "OFF")]

var/spack/repos/builtin/packages/hiprand/package.py

@@ -108,7 +108,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
     def setup_build_environment(self, env):
         env.set("CXX", self.spec["hip"].hipcc)
         if self.spec.satisfies("+asan"):
-            self.asan_on(env, self.spec["llvm-amdgpu"].prefix)
+            self.asan_on(env)
 
     @classmethod
     def determine_version(cls, lib):

var/spack/repos/builtin/packages/hipsolver/package.py

@@ -127,7 +127,7 @@ def determine_version(cls, lib):
 
     def setup_build_environment(self, env):
         if self.spec.satisfies("+asan"):
-            self.asan_on(env, self.spec["llvm-amdgpu"].prefix)
+            self.asan_on(env)
 
     def cmake_args(self):
         args = [

var/spack/repos/builtin/packages/hipsparse/package.py

@@ -103,7 +103,7 @@ def determine_version(cls, lib):
 
     def setup_build_environment(self, env):
         if self.spec.satisfies("+asan"):
-            self.asan_on(env, self.spec["llvm-amdgpu"].prefix)
+            self.asan_on(env)
 
     def cmake_args(self):
         args = [

var/spack/repos/builtin/packages/roctracer-dev/package.py

@@ -105,7 +105,7 @@ def patch(self):
 
     def setup_build_environment(self, env):
         if self.spec.satisfies("+asan"):
-            self.asan_on(env, self.spec["llvm-amdgpu"].prefix)
+            self.asan_on(env)
 
     def cmake_args(self):
         args = [