From 437c1e438e3c05706adf5f39ea39725a8515e87f Mon Sep 17 00:00:00 2001
From: Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com>
Date: Mon, 2 Aug 2021 00:38:34 -0700
Subject: add MIOPEN_AMDGCN_ASSEMBLER to cmake args (#25159)

---
 var/spack/repos/builtin/packages/miopen-hip/package.py    | 4 ++++
 var/spack/repos/builtin/packages/miopen-opencl/package.py | 4 ++++
 var/spack/repos/builtin/packages/mivisionx/package.py     | 4 ++++
 3 files changed, 12 insertions(+)

(limited to 'var')

diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py
index 2479e1e70c..e08d349128 100644
--- a/var/spack/repos/builtin/packages/miopen-hip/package.py
+++ b/var/spack/repos/builtin/packages/miopen-hip/package.py
@@ -67,6 +67,10 @@ class MiopenHip(CMakePackage):
                 'CMAKE_CXX_COMPILER',
                 '{0}/bin/clang++'.format(spec['llvm-amdgpu'].prefix)
             ),
+            self.define(
+                'MIOPEN_AMDGCN_ASSEMBLER',
+                '{0}/bin/clang'.format(spec['llvm-amdgpu'].prefix)
+            ),
             self.define('Boost_USE_STATIC_LIBS', 'Off'),
             self.define('HIP_PREFIX_PATH', spec['hip'].prefix),
             self.define('DEVICELIBS_PREFIX_PATH', self.get_bitcode_dir())
diff --git a/var/spack/repos/builtin/packages/miopen-opencl/package.py b/var/spack/repos/builtin/packages/miopen-opencl/package.py
index 1c5d4ee1be..1e095d5d2a 100644
--- a/var/spack/repos/builtin/packages/miopen-opencl/package.py
+++ b/var/spack/repos/builtin/packages/miopen-opencl/package.py
@@ -59,6 +59,10 @@ class MiopenOpencl(CMakePackage):
                 'HIP_CXX_COMPILER',
                 '{0}/bin/clang++'.format(self.spec['llvm-amdgpu'].prefix)
             ),
+            self.define(
+                'MIOPEN_AMDGCN_ASSEMBLER',
+                '{0}/bin/clang'.format(self.spec['llvm-amdgpu'].prefix)
+            ),
             self.define('Boost_USE_STATIC_LIBS', 'Off')
         ]
         return args
diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py
index 3aabcb7428..c5e5700e22 100644
--- a/var/spack/repos/builtin/packages/mivisionx/package.py
+++ b/var/spack/repos/builtin/packages/mivisionx/package.py
@@ -41,6 +41,10 @@ class Mivisionx(CMakePackage):
                         self.spec['rocm-opencl'].prefix,
                         'amd_openvx/cmake/FindOpenCL.cmake',
                         string=True)
+            filter_file('/opt/rocm/mivisionx/include',
+                        self.spec['mivisionx'].prefix.include,
+                        'utilities/mv_deploy/CMakeLists.txt',
+                        string=True)
 
     def flag_handler(self, name, flags):
         spec = self.spec
-- 
cgit v1.2.3-70-g09d2