This is the first step to remove rocm-ocl-icd.
We don't build amd icd after this commit.
We still need to remove header files usage in future steps.
Change-Id: Ic4ac5476180f9ef2ce87b62891c08b28d6c9bfd2
[ROCm/clr commit: 5f775b8b7f]
This reverts commit 6c46d696ae.
Reason for revert: due to windows staging branch using Opencl-icd-loader master
Change-Id: I9cca7564a21de1733665a34da6f0322aa3b886e7
[ROCm/clr commit: f44ca70bb7]
Using backward compatibility paths will provide #warning message be default.
Compile time option added to enable/disable the #error message.
Updated the backward compatibility message
Change-Id: I3bab00df26145991b32176d2d76977c2e953bf5f
[ROCm/clr commit: f788150132]
Package ASAN libraries and License file for ASAN package
Suffix "asan" added to package name
Change-Id: I1ae715d2ebc50d8a1ca6336c25802b989584ce40
[ROCm/clr commit: 8a4bf91145]
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]
The workaround for file-reorg in opencl is not required with changes in build script.
Similar workaround code in atmi is causing installation error in spack atmi and fixed by build scripts changes and removing the workaround
Depends-On: I2c79675ec05e1e7de2baa0a21033939f0eadac3d
Change-Id: I9b5640a7b284f1df6b3127938c51da24ce60b69e
[ROCm/clr commit: a06eda1f73]
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]
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]
Package installed in /opt/rocm
Warpper header files and soft link to libraries for backward compatibilty
Change-Id: Ib1edb27713dfa589369f0a03c59d3ac1b0dc8400
[ROCm/clr commit: c110ac233f]
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]
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]
ROCM_DEP_ROCMCORE is not passed to the packaging cmake files, so
rocm-core is never added to the dependency list, even if it's set.
Signed-off-by: Jeremy Newton <Jeremy.Newton@amd.com>
Change-Id: I57ec415b5e2b816f8bc226a66643ca0a808e9a35
[ROCm/clr commit: 3898530e2c]
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]
Fix FEAT-39125
Add EMU_ENV option. If it is ON, the building is for
emulation environment, thus some logics can be adjusted
to match emulation environment. If it is OFF, the
building is for regular environment.
Currently only ocltst will use the option. But it can
be used for other modules.
Change-Id: I54e1bc1309e82794b41fca2ae1f01f004138dced
[ROCm/clr commit: 76c6dcd558]
This patch also includes additional cleanup logic to the installation
rules. The OpenCL ICD already defines its own installation rules, no
need to duplicate them.
Change-Id: Id1c386307a83b82e21f6fa132e41957d9b348fd3
[ROCm/clr commit: c6eadce180]
git is invoked to populate OPENCL_VERSION_GITDATE, but the value is no
where to be used in the project.
Change-Id: Iceae650e6260c2ccd749f582034fc09205b4af7a
[ROCm/clr commit: 40f87d6d86]
Don't use hardcoded install destinations. CMake will decide where things
should be installed based on platform.
Change-Id: Ifcf956181d3efb32d4ce6191a89c1ea225d0e8cc
[ROCm/clr commit: d53c19cfa5]
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]
This reverts commit d09b6e30fc.
Reason for revert: need to update other projects (linuxpro & marnier)
Change-Id: Ib02194d052170e487cd56480eb0d9226895aa580
[ROCm/clr commit: 0762c948b6]
COMGR_DYN_DLL is used by rocclr to load COMGR as dynamic library.
Need to remove this flag while linking COMGR as static lib by
ROCclr.
Default option is set to link COMGR as dynamic library
Change-Id: I5631a8c1d896bd4d7e5ecf5ef5fa4f631cd2244d
[ROCm/clr commit: 00223c5697]
- 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]
Use the cmake method, and consolidate setting the language standard in
one place.
Change-Id: I96826c31955b1553ed1beb94203c99933075bb0a
[ROCm/clr commit: dd5f255c7e]
Tests are now excluded from the main build, however ocltst can still be built by running `cmake --build . --target ocltst`.
Test modules can be run by invoking the test_${module_name} target, for example `cmake --build . --target test_oclruntime`.
Change-Id: I6f40d3bd318e821e4fbf35ccfa395dc7036673cb
[ROCm/clr commit: 8790099ba9]
Fix compile error.
Before this change, there is compile error in my build computer. The cause is that /opt/rocm/include has an older version of CL header files.
When compiling, we should use header files from this opencl source code folders first.
This fix changes the order of include directories. Search the header files inside this opencl source code folders first.
Change-Id: I3420a634ed9e1b38b8e5201a0a39a36d61f97986
[ROCm/clr commit: a400051d3a]
Use standard cmake option handling, and switch to standard ON/OFF for
boolean. Try to maintain compatability with the "yes" check that build
scripts are now using.
Change-Id: Ia932e93f818c0897a87bfc49b070e36c7be7dd74
[ROCm/clr commit: aa0c163066]
7eda01ba broke this. This is still mostly a commit order hack until
the ROCclr change is submitted.
Change-Id: I43762963dbc66f1dc83916d2f0e9c90e4fcbf7c1
[ROCm/clr commit: 9f9d35ad86]
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
[ROCm/clr commit: e43d427cdd]
Xie, AlexBin
Luu, Jonathan
Chaudhary, Jatin Jaikishan
Julia Jiang
AravindanC
Ranjith Ramakrishnan
victzhan
Jason Tang
Jeremy Newton
Ashutosh Mishra
Freddy Paul
taosang2
Jason Tang
Vladislav Sytchenko
Payam Ghafari
Pruthvi Madugundu
Matt Arsenault