56 Коммитов

Автор SHA1 Сообщение Дата
raramakr eddd4c3601 SWDEV-505204 - Update libamdocl.so installation path to avoid exposing all ROCm libraries via ldconfig (#1914)
ldconfig is run during rocm-opencl package installation.
Installing libamdocl.so in /opt/rocm-xxx/lib exposes all ROCm libraries when /opt/rocm/lib is added to ldconfig.
To prevent this, libamdocl.so is now installed in /opt/rocm-xxx/lib/opencl.
ldconfig will use the updated path, limiting exposure to only libamdocl.so library.

Co-authored-by: raramakr <raramakr@amd.com>
2025-11-19 21:14:28 +05:30
Joseph Macaranas dd1a2dbf8a Fix LICENSE path for opencl build (#939) 2025-09-10 17:54:22 -04:00
Xie, AlexBin a158b5c4a2 SWDEV-540176 - deb and rpm package include OpenCL config files (#615)
[ROCm/clr commit: 592c25e936]
2025-06-27 11:59:24 -04:00
Ramakrishnan, Ranjith 1e0dc5ef34 SWDEV-535853 - Update the dependencies of rocm-opencl package (#462)
Currently rocm-opencl depends on ocl-icd runtime package. libopencl.so is part of ocl-icd-dev/devel package
Added the same to the dependency list of rocm-opencl-dev/devel package

[ROCm/clr commit: 7a2ba7e5db]
2025-06-19 11:32:32 -07:00
Chaudhary, Jatin Jaikishan c72604a2af SWDEV-509213 - make cmake_minimum_required consistent across clr (#51)
Change-Id: Ib0b1df7af8984a37d6bf7ca68ec99597d5978821

[ROCm/clr commit: fcaefe97b8]
2025-04-15 15:23:41 +05:30
Ranjith Ramakrishnan 87b59eade6 SWDEV-498728 - Add backward compatibility for deprecated package rocm-opencl-icd-loader
Change-Id: Ic659639e3bb55bd90bd50acf28d8079ff7b084bc


[ROCm/clr commit: 7c9c7a6332]
2024-12-09 16:27:43 -05:00
Jaydeep Patel d65afe707c SWDEV-482751 - Use ocl-icd-devel package for SLES.
Change-Id: I30e6243d697dc984a42051c20e336551d50d8e94


[ROCm/clr commit: 1f55a707b4]
2024-10-20 23:55:02 -04:00
Alex Xie 2a6792ec25 SWDEV-482751 - Depends on distro opencl icd loader
Since we don't distribute icd loader, we need to install distro icd loader.

Change-Id: I1ea86bcf7c642a034c53f71130b15de1fa27e31e


[ROCm/clr commit: df9ae754a4]
2024-10-16 16:21:58 -04:00
Julia Jiang 08e18077cc Revert "SWDEV-444098 - remove rocm-ocl-icd packaging"
This reverts commit 6c46d696ae.

Reason for revert: due to windows staging branch using Opencl-icd-loader master

Change-Id: I9cca7564a21de1733665a34da6f0322aa3b886e7


[ROCm/clr commit: f44ca70bb7]
2024-03-22 16:59:23 -04:00
Julia Jiang 6c46d696ae SWDEV-444098 - remove rocm-ocl-icd packaging
Change-Id: If0234ff03cf86e1f0435e743c1df75a3e179d48c

Jenifer helped trigger a combined PSDB for the below three changes
https://gerrit-git.amd.com/c/compute/ec/prototype/+/1020194
https://gerrit-git.amd.com/c/compute/ec/clr/+/1003601
https://gerrit-git.amd.com/c/compute/ec/OpenCL-ICD-Loader/+/1012373

Combined PSDB was successful:
http://rocm-ci.amd.com/job/compute-psdb-staging/27382/
Change-Id: If0234ff03cf86e1f0435e743c1df75a3e179d48c


[ROCm/clr commit: 5f68a4531a]
2024-03-15 10:46:07 -05:00
Alex Xie 15756659d0 SWDEV-438177 - move ldconfig to amd opencl package instead of icd
Change-Id: I2486f38d398a508ead7d24f03d4cf7816d5c157c


[ROCm/clr commit: 06ff62da61]
2023-12-20 10:04:58 -05:00
Alex Xie 5aaa498e45 SWDEV-434373 - Add icd config to opencl package
Change-Id: Id2d143ae82b0fa4d5321912fca9daa1e958f1fb6


[ROCm/clr commit: 5a3c4ea49d]
2023-12-11 11:17:37 -05:00
Jason Tang 6edd795788 SWDEV-404928 - Remove rocm-opencl depends of rocm-ocl-icd
Will replace rocm-ocl-icd with packaging of khronos opencl-icd-loader

Change-Id: I26da58e80fd1426b9908d0b524f93b17ab27626d


[ROCm/clr commit: a4bba6d705]
2023-06-14 14:35:57 -04:00
Ranjith Ramakrishnan 94be4c2c2d SWDEV-351540 - ASAN packaging for OpenCL
Package ASAN libraries and License file for ASAN package
Suffix "asan" added to package name

Change-Id: I1ae715d2ebc50d8a1ca6336c25802b989584ce40


[ROCm/clr commit: 8a4bf91145]
2023-04-07 12:35:25 +00:00
Maneesh Gupta 744257e243 SWDEV-361630 - Fix rocm-ocl-icd package
Change-Id: Ib52dff09ee1c72b41c014b5e022cc2d8d79e0754


[ROCm/clr commit: c6760a55d0]
2023-03-30 09:10:58 +00:00
Maneesh Gupta 90da0eaee4 SWDEV-361630 - Enable opencl build
Change-Id: I19f8aa2e8157b8bfa053c502dcd63c52f0b6f104


[ROCm/clr commit: d9ceb6a3a3]
2023-03-26 15:42:33 +00:00
Ranjith Ramakrishnan 7a0d151d45 SWDEV-310152 - ldconfig should be run from each components providing shared library, since rpath will be removed from binaries and libraries
Revert "SWDEV-310152 - Remove ldconfig from rocm-ocl-icd package"

This reverts commit 891f23718c.

Change-Id: Id07f4c8b2915c4ed7937094087ddba8402444da9


[ROCm/clr commit: cb625e8fb2]
2022-11-23 13:03:40 -05:00
Ranjith Ramakrishnan 891f23718c SWDEV-310152 - Remove ldconfig from rocm-ocl-icd package
ldconfig functionality moved from rocm-ocl-icd to rocm-core package

Depends-On: I1148fb36240c2e63994743ccf135e51e90695c37
Depends-On: I7ba908865187d578c273b20bf31a08a3458fbbfb
Change-Id: I4769c31df12fa3f1bb8baa283e0647ce9254e594


[ROCm/clr commit: 0f5c2f0ba8]
2022-11-21 03:48:17 -05:00
Ranjith Ramakrishnan b2e30b6ffa SWDEV-340761 - Limit the removal of opencl conf file to package removal and provide unique name to icd file
While upgrading packaging in SLES/RHEL, the package to be upgraded is installed first, followed by cleanup of the older one
During upgrade 10-rocm-opencl.conf and icd file is getting removed as part of clean up, since the file name and path is same in different package versions.
Limit the removal of opencl conf file to  uninstall/removal of package and not during upgrade.
Used unique name for icd file

Change-Id: Ib34a78ce53e6b7d95adb70ccfd56474a297b64ca


[ROCm/clr commit: 3d350393d8]
2022-09-16 00:48:37 -07:00
Jason Tang 92eb8654a4 SWDEV-350058 - Create ocltst package
Change-Id: Ifd1f538254c174da5bca2535ade5ac25c49bf673


[ROCm/clr commit: 145afd6a78]
2022-08-19 18:18:15 -04:00
Jeremy Newton 90d46dc278 SWDEV-336248 - Don't exclude cl_egl.h from install
cl_icd.h includes cl_egl.h, but cl_egl.h is excluded from install. It
was reported by the community that including cl_icd.h would error due to
the missing cl_egl.h file.

I'm assuming that cl_egl.h was excluded because EGL isn't important for
ROCm. Since cl_icd.h has some important typedefs, it makes sense just
to include cl_egl.h, which seems to be a common practice in open source
projects.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I506257c2dc51512ec8e11b1e5dadbe6e48ad785b


[ROCm/clr commit: e9dd848149]
2022-05-09 14:33:00 -04:00
Jeremy Newton dbacdbdf88 SWDEV-321116 - Allow disabling ICD loader
This patch adds an option (BUILD_ICD) to toggle the ICD loader build
with rocm-opencl. This isn't useful for official ROCm use, but distros
or users may want build rocm-opencl with their own OCL ICD loader.

The default option is BUILD_ICD=ON.
If this option is set to OFF, an OpenCL OCD loader must be installed
prior to attempting to build rocm-opencl.

E.g. distros already provide ocl icd loader packages:
sudo yum install ocd-icd-devel
sudo apt-get install ocl-icd-opencl-dev
sudo zypper install ocd-icd-devel

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I6006593eceed543cd829e8949ec2256482815673


[ROCm/clr commit: d1782940f3]
2022-04-13 18:27:13 -04:00
Jeremy Newton 6e388071ba SWDEV-321118 - Use GNUInstallDirs
Use GNUInstallDirs variables to determine the location of BINDIR,
LIBDIR, DOCDIR, and SYSCONFDIR.

Note that CMAKE_INSTALL_LIBDIR is overriden, since the default for RHEL
is lib64, but ROCm packaging wants it to be lib always. Distros or users
can easily override this.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: Ifb38263dce80d80c5ebb4eacd8e49c76bb013a44


[ROCm/clr commit: b8c124acb5]
2022-04-08 13:52:08 -04:00
Ranjith Ramakrishnan 72aef87ed5 SWDEV-291455 - File Reorganization with backward compatibility
Package installed in /opt/rocm
Warpper header files and soft link to libraries for backward compatibilty

Change-Id: Ib1edb27713dfa589369f0a03c59d3ac1b0dc8400


[ROCm/clr commit: c110ac233f]
2022-02-27 15:36:02 -08:00
Jeremy Newton a0a9f3806b Merge "SWDEV-1 - Fix cmake build" into amd-staging
[ROCm/clr commit: 7ac4483be7]
2022-02-23 14:11:56 -05:00
Saravanan Solaiyappan 9ba8e04eda SWDEV-323670 - RPM: Remove symlinks during upgrade as well
During RPM upgrade, lib/libOpenCL.so* files/symlinks from the previous
installed version are not removed.
This change will remove those symlinks as part of the RPM remove
or upgrade operation.

Signed-off-by: Saravanan Solaiyappan <saravanan.solaiyappan@amd.com>
Change-Id: Ia943407052ec24911756042a5f9839a605522443


[ROCm/clr commit: 56dde03fbb]
2022-02-22 08:04:02 -05:00
Saravanan Solaiyappan 4c1bb19860 SWDEV-323670 - Remove lib/libOpenCL.so* symlinks during upgrade
During upgrade lib/libOpenCL.so* files/symlinks are not
removed.
This change will remove those symlinks as part of the upgrade
package activity.

Signed-off-by: Saravanan Solaiyappan <saravanan.solaiyappan@amd.com>
Change-Id: Ia12e89e857b358101f93a6044fe090aa7acafbe0


[ROCm/clr commit: c741a808ae]
2022-02-17 09:43:30 -05:00
Jeremy Newton 87809a0387 SWDEV-1 - Fix cmake build
CPACK_PACKAGING_INSTALL_PREFIX is defined in the wrong location.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: Id8ce6beb1d18878c9132cab335cb372a53cc0ee8


[ROCm/clr commit: 9c1f2da1a2]
2022-02-09 16:09:25 -05:00
Ashutosh Mishra 1f10c39e2a SWDEV-306262 - Fix RUNPATH
RUNPATH was not changed to correct ROCM_RPATH
Packaged proper binaries after RUNPATH correction

Signed-off-by: Ashutosh Mishra <Ashutosh.Mishra@amd.com>

Change-Id: I97443cc0d6cb1ecf7352e3c83ae0fe38a8f339bf


[ROCm/clr commit: e3fe3a6109]
2022-02-08 15:14:05 -08:00
Freddy Paul 9b9669d29c SWDEV-309024 - Providing debug information for released libraries
Current packaging structure using custom command fail to work for
generating debug symbols.Hence changing the packaging to more
conventional way of using single CMakeLists.txt and split packages
using components like binary, dev and icd

Change-Id: I7fcf5f8afc3602f77576f2a13aa4916acb10888b


[ROCm/clr commit: 8fa82f6e64]
2022-01-26 08:14:05 -08:00
Jeremy Newton fb6409b090 SWDEV-306262 - Add ocl-icd subpackages
These packages contains only the ICD loader (libopencl.so). This allows
legacy opencl (PAL) to use these packages instead of duplicating these
packages in both builds.

This also resolves a licensing issue where OCL ICD is licensed as
Apache, while opencl is MIT. Having a separate package avoid license
confusion.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I3dd29239841da7f5dc767419a9bc35d9046e9936


[ROCm/clr commit: cb1e7cd48d]
2021-12-08 16:15:59 -05:00
Jeremy Newton 91baa9ded6 SWDEV-306293 - fix regression in cleanup
To fix SWDEV-306293, x86_64-rocm-opencl.conf was renamed to
10-rocm-opencl.conf. This was not changes in the clean up, only in the
creation, so the patch causes a regression by not cleaning up the new
filename.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I4aa456955f6f7c2d52a3560e5e792537f95add17


[ROCm/clr commit: e885ae9591]
2021-12-07 09:59:03 -05:00
Jeremy Newton 8c921fc3cc Merge "SWDEV-312927 - Fix rocm-opencl package licensing" into amd-staging
[ROCm/clr commit: df2eec8465]
2021-12-02 11:48:59 -05:00
Freddy Paul 62730f576a SWDEV-306293 - Failing Ubuntu, CL-GL subtest in OpenCL conformance
renaming rocm-opencl ldconfig file with "10-" prefix to prioritize
over system icd loader.
Change-Id: I0a54de7a0bc0e256d6470eae743ec712d1e42a36

Change-Id: I4af1d0e3e27f40f8b03b798cae43cfd4ba4a1880


[ROCm/clr commit: 3f1e227182]
2021-12-01 07:29:54 -08:00
Jeremy Newton 1105bca899 SWDEV-312927 - Fix rocm-opencl package licensing
The license file needs to be installed.

RPM also requires the LICENSE field to be set.

Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I8bcec77e51b88f3f6a6fa5799d6e38db1d1ab566


[ROCm/clr commit: 5416bcb7e8]
2021-11-30 17:27:03 -05:00
Ashutosh Misra 92e972eae3 SWDEV-264665 - resolve uninstall breakage
Check required of existence of dir in the prerm

Change-Id: I54e1bc0309e82794b41fcc2ae1f01f004138dcee


[ROCm/clr commit: 0f79d51998]
2021-11-12 12:37:13 -04:00
Freddy Paul 5ed4fa6c28 SWDEV-304500 - OpenCL tests are failed for Ubuntu 20.04.3
As part of the stack unification some of the application using
opencl seem to depend on libopencl.so provided from thirdparty
providers. For libopencl.so from thirdparty provider to find
libamdocl.so ldconfig path to {opencl install path}/lib is required

Change-Id: I8e12e463209a44177ee433644c75ef0781f1da2f


[ROCm/clr commit: b4b83e274e]
2021-09-27 07:36:06 -07:00
Icarus Sparry 45552d6168 SWDEV-293197 - Add dependency on rocm-core
Signed-off-by: Icarus Sparry <icarus.sparry@amd.com>
Change-Id: Id1b34c7c6fa551f3aacc35827cb6906cec4484e3


[ROCm/clr commit: d91e1d9daa]
2021-09-01 00:21:42 -07:00
Freddy Paul 799280db07 SWDEV-300274 - Path to OCL library not handled consistently
OpenCl applications are expected to work with publicly available
libopencl.so that is capable of finding vendor specific library
libamdocl64.so using the ICD loader entry.
x86_64-rocm-opencl.conf should provide ldconfig entry for
libamdocl64.so and libamdocl64.so shall use RUNPATH for finding
dependencies like hsa runtime.

Change-Id: Icf1267c7a04c1545eae0a7236bf8b7581ffa11ef


[ROCm/clr commit: 4790350f63]
2021-08-26 09:31:03 -07:00
Vladislav Sytchenko fb22edcc5e SWDEV-294276 - Fix clinfo install permissions
Specify for packaging that clinfo is a program. This will set its
default permissions to include OWNER_EXECUTE, GROUP_EXECUTE and
WORLD_EXECUTE.

Change-Id: I986f6db73efa9a3f8ab5bedfb829adccad0759aa


[ROCm/clr commit: 31e688d8f0]
2021-07-08 11:26:38 -04:00
Vladislav Sytchenko 9f54cba1ed SWDEV-273235 - Cleanup OpenCL installation logic
Don't use hardcoded install destinations. CMake will decide where things
should be installed based on platform.

Change-Id: Ifcf956181d3efb32d4ce6191a89c1ea225d0e8cc


[ROCm/clr commit: d53c19cfa5]
2021-06-01 14:31:14 -04:00
Vladislav Sytchenko f7bbb7b988 SWDEV-273235 - Initial support for Windows CMake
This change is tied to the ROCclr cmake rework. ROCclr will now be built
as part of OpenCL itself.

All the dependencies on comgr and rocr have been moved into ROCclr
itself. This allows OpenCL to pull in all the required compiler/runtime
dependencies by simply linking against ROCclr. Note that ROCclr needs to
be configured from OpenCL cmake command line. If not, we will default to
LC + ROCr support.

Change-Id: I5271302d073aef8cfa617828d218c856711bf9ba


[ROCm/clr commit: 1c16690617]
2021-05-27 13:08:12 -04:00
Payam Ghafari 6dc853cb26 Revert "SWDEV-197835 - adding Khronos OpenCL ICD build"
This reverts commit d09b6e30fc.

Reason for revert: need to update other projects (linuxpro & marnier)

Change-Id: Ib02194d052170e487cd56480eb0d9226895aa580


[ROCm/clr commit: 0762c948b6]
2021-05-18 10:31:25 -04:00
Payam d09b6e30fc SWDEV-197835 - adding Khronos OpenCL ICD build
Change-Id: Id7d9cd6076c6f1670eedbea06a6976c05e391520


[ROCm/clr commit: 932c83fe8f]
2021-05-17 18:19:30 -04:00
Cole Nelson 982fb1b666 packaging: conformant package names
This patchset addresses package name requirements:
http://confluence.amd.com/pages/viewpage.action?pageId=234791224

Email contact  corrected: SWDEV-258090

Names as tested (internal example):
rocm-opencl-dev_2.0.0.40000-cpnn.14322_amd64.deb

(release examples):
rocm-opencl-2.0.0.40000-sles152.3022.x86_64.rpm
rocm-opencl-devel-2.0.0.40000-3022.el8.x86_64.rpm

Change-Id: Icb202085ae4065ba264d02d34cadbf1a0f393f9a
Signed-off-by: Cole Nelson <cole.nelson@amd.com>


[ROCm/clr commit: 2174367fb4]
2020-11-20 07:17:35 -08:00
Pruthvi Madugundu 67591d6671 Adding support for multiple icd files specific to ROCm version
- amdocl64.icd is renamed to amdocl64_<ROCM_PATCH_VERSION>.icd
- This will enable support for multiple icd for different versions of
  ROCm

Signed-off-by: Pruthvi Madugundu <pruthvi.madugundu@amd.com>
Change-Id: I8031b19f8579507ffb6727dedcd2e3fbb4e45de8


[ROCm/clr commit: b88a313eff]
2020-07-09 18:04:18 -07:00
Jason Tang c0a9560c1b Fix CentOS build
Change-Id: Id0956f2a876077a3528c4fafc136586b95fdda70


[ROCm/clr commit: 0394f79d4d]
2020-06-29 18:49:48 -04:00
Jason Tang 3c0b0d9d92 Not to use fixnames
Change-Id: I50c9503cad1fc072edec989a4f82a27bb7bb3909


[ROCm/clr commit: 4666113db0]
2020-06-28 18:57:16 -04:00
Jason Tang 70404ac7d7 SWDEV-204566 - Use ROCMSetupVersion to set package version
Change-Id: I29b9f748291b3802de65c9f29f791050853c2d12


[ROCm/clr commit: 4dcfe78e56]
2020-06-01 16:39:35 -04:00
Ramesh Errabolu d09b2ebb3c Remove dependency on hsa-ext-rocr-dev package
Change-Id: I1b4032390c128e71a2f9a743b9db9b7bf7713e91


[ROCm/clr commit: 42150302e6]
2020-05-15 16:56:30 -05:00