This reverts commit 5f68a4531a.
Reason for revert: due to windows staging branch using Opencl-icd-loader master
Change-Id: I9cca7564a21de1733665a34da6f0322aa3b886e7
ldconfig functionality moved from rocm-ocl-icd to rocm-core package
Depends-On: I1148fb36240c2e63994743ccf135e51e90695c37
Depends-On: I7ba908865187d578c273b20bf31a08a3458fbbfb
Change-Id: I4769c31df12fa3f1bb8baa283e0647ce9254e594
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
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
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
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
Package installed in /opt/rocm
Warpper header files and soft link to libraries for backward compatibilty
Change-Id: Ib1edb27713dfa589369f0a03c59d3ac1b0dc8400
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
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
CPACK_PACKAGING_INSTALL_PREFIX is defined in the wrong location.
Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: Id8ce6beb1d18878c9132cab335cb372a53cc0ee8
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
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
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
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
renaming rocm-opencl ldconfig file with "10-" prefix to prioritize
over system icd loader.
Change-Id: I0a54de7a0bc0e256d6470eae743ec712d1e42a36
Change-Id: I4af1d0e3e27f40f8b03b798cae43cfd4ba4a1880
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
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
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
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
Don't use hardcoded install destinations. CMake will decide where things
should be installed based on platform.
Change-Id: Ifcf956181d3efb32d4ce6191a89c1ea225d0e8cc
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
This reverts commit 932c83fe8f.
Reason for revert: need to update other projects (linuxpro & marnier)
Change-Id: Ib02194d052170e487cd56480eb0d9226895aa580
- 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
Move libOpenCL.so from rocm-opencl-dev package to rocm-opencl.
Having the libOpenCL.so alone and that too just a symlink pointing
to a file in another package is not the right way.
Adding a symlink for libOpenCL... to rocm/lib will make package
deployment easier.
Change-Id: Icc98d2280253c8a485ef906e97fc75129ad6d064
- The entry removed only when the installation is NOT /opt/rocm
Signed-off-by: Pruthvi Madugundu <pruthvi.madugundu@amd.com>
Change-Id: Ib90f89e63cffb4ae8f628af15387a49bb6511a5f
Update the packaging code to be CMake 3.5 compatible for CI. Create two
packages rocm-opencl and rocm-opencl-dev on Ubuntu and CentOS. Add
proper versioning into naming.
Change-Id: I116081b7f6f7efa4be43ab3a66e4d3bff0589298
Jaydeep Patel
Alex Xie
Julia Jiang
Jason Tang
Ranjith Ramakrishnan
Maneesh Gupta
Jason Tang
Jeremy Newton
Saravanan Solaiyappan
Ashutosh Mishra
Freddy Paul
Icarus Sparry
Vladislav Sytchenko
Payam Ghafari
Cole Nelson
Pruthvi Madugundu
Ramesh Errabolu
Aaron Enye Shi