diff --git a/README.md b/README.md index 049cfaa93..95069417c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -AOMP - V 0.7-0 +AOMP - V 0.7-1 ============== AOMP: AMD OpenMP Compiler This is README.md for https://github.com/ROCM-Developer-Tools/aomp . This is the base repository for AOMP. Use this for issues, documentation, packaging, examples, and building. -The last release of AOMP is version 0.7-0. Currently version 0.7-1 is under development. +The last release of AOMP is version 0.7-1. Currently version 0.7-2 is under development. AOMP is an experimental compiler that is intended to support multiple programming models including OpenMP, HIP, device OpenCL, and cuda clang. It supports offloading to multiple GPU acceleration targets(multi-target). diff --git a/bin/aomp_common_vars b/bin/aomp_common_vars index 8138a9451..077bfe7a6 100755 --- a/bin/aomp_common_vars +++ b/bin/aomp_common_vars @@ -6,7 +6,7 @@ # Set the AOMP VERSION STRING. # After a release, this is changed to the next release under development AOMP_VERSION=${AOMP_VERSION:-"0.7"} -AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"1"} +AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"2"} AOMP_VERSION_STRING=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"} ROCM_VERSION="2.7.22" export AOMP_VERSION_STRING AOMP_VERSION AOMP_VERSION_MOD ROCM_VERSION diff --git a/docs/RHELINSTALL.md b/docs/RHELINSTALL.md index e41b6ec07..d7bd7a46f 100644 --- a/docs/RHELINSTALL.md +++ b/docs/RHELINSTALL.md @@ -6,12 +6,12 @@ sudo yum install perl-Digest-MD5 ``` ### Download and Install ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-0/aomp_REDHAT_7-0.7-0.x86_64.rpm -sudo rpm -i aomp_REDHAT_7-0.7-0.x86_64.rpm +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-1/aomp_REDHAT_7-0.7-1.x86_64.rpm +sudo rpm -i aomp_REDHAT_7-0.7-1.x86_64.rpm ``` If CUDA is not installed the installation may cancel, to bypass this: ``` -sudo rpm -i --nodeps aomp_REDHAT_7-0.7-0.x86_64.rpm. +sudo rpm -i --nodeps aomp_REDHAT_7-0.7-1.x86_64.rpm. ``` Confirm AOMP environment variable is set: ``` diff --git a/docs/RPMINSTALL.md b/docs/RPMINSTALL.md index a64084d60..dc547a35d 100644 --- a/docs/RPMINSTALL.md +++ b/docs/RPMINSTALL.md @@ -3,20 +3,20 @@ ### RPM Install For rpm-based Linux distributions, use this rpm ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/r/aomp-0.7-0.x86_64.rpm -sudo rpm -i aomp-0.7-0.x86_64.rpm +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-1/aomp_SLES15_SP1-0.7-1.x86_64.rpm +sudo rpm -i aomp-0.7-1.x86_64.rpm ``` --> ### No root RPM install -By default, the packages install their content to the release directory /opt/rocm/aomp_0.X-Y and then a symbolic link is created at /opt/rocm/aomp to the release directory. This requires root access. +By default, the packages install their content to the release directory /usr/lib/aomp_0.X-Y and then a symbolic link is created at /usr/lib/aomp to the release directory. This requires root access. To install the rpm package without root access into your home directory, you can run these commands. ``` mkdir /tmp/temproot ; cd /tmp/temproot - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-0/aomp-1604-0.7-0.x86_64.rpm - rpm2cpio aomp-1604-0.7-0.x86_64.rpm | cpio -idmv - mv /tmp/temproot/opt/rocm $HOME + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-1/aomp_SLES15_SP1-0.7-1.x86_64.rpm + rpm2cpio aomp_SLES15_SP1-0.7-1.x86_64.rpm | cpio -idmv + mv /tmp/temproot/usr/lib $HOME export PATH=$PATH:$HOME/rocm/aomp/bin export AOMP=$HOME/rocm/aomp ``` diff --git a/docs/SLES15INSTALL.md b/docs/SLES15INSTALL.md index 5a2bc5723..10bbbc2d9 100644 --- a/docs/SLES15INSTALL.md +++ b/docs/SLES15INSTALL.md @@ -1,8 +1,8 @@ # AOMP SUSE SLES-15-SP1 Install AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatically be set to the install location. This may require a new terminal to be launched to see the change. ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-0/aomp_SLES15_SP1-0.7-0.x86_64.rpm -sudo rpm -i aomp_SLES15_SP1-0.7-0.x86_64.rpm +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-1/aomp_SLES15_SP1-0.7-1.x86_64.rpm +sudo rpm -i aomp_SLES15_SP1-0.7-1.x86_64.rpm ``` Confirm AOMP environment variable is set: ``` diff --git a/docs/SOURCEINSTALL.md b/docs/SOURCEINSTALL.md index fb97b7f51..846d610c3 100644 --- a/docs/SOURCEINSTALL.md +++ b/docs/SOURCEINSTALL.md @@ -1,4 +1,4 @@ -# Source Install V 0.7-0 (DEV) +# Source Install V 0.7-1 (DEV) Build and install from sources is possible. However, the source build for AOMP is complex for several reasons. - Many repos are required. The clone_aomp.sh script ensures you have all repos and the correct branch. @@ -45,16 +45,16 @@ Please verify you have the proper software installed as AOMP needs certain suppo ``` Choose a Build Version (Development or Release) -The development version is the next version to be released. It is possible that the development version is broken due to regressions that often occur during development. If instead, you want to build from the sources of a previous release such as 0.7-0 that is possible as well. +The development version is the next version to be released. It is possible that the development version is broken due to regressions that often occur during development. If instead, you want to build from the sources of a previous release such as 0.7-1 that is possible as well. For the Development Branch: ``` - git checkout 0.7 + git checkout master ``` For the Release Branch: ``` - git checkout rel_0.7-0 + git checkout rel_0.7-1 git pull ``` Clone and Build: diff --git a/docs/TESTINSTALL.md b/docs/TESTINSTALL.md index 42525ae90..faf76a817 100644 --- a/docs/TESTINSTALL.md +++ b/docs/TESTINSTALL.md @@ -2,18 +2,18 @@ -The default install location is /opt/rocm/aomp. To run the given examples, for example in /opt/rocm/aomp/examples/openmp do the following: +The default install location is /usr/lib/aomp. To run the given examples, for example in /usr/lib/aomp/examples/openmp do the following: ### Copy the example openmp directory somewhere writable ``` -cd /opt/rocm/aomp/examples/ +cd /usr/lib/aomp/examples/ cp -rp openmp /work/tmp/openmp-examples cd /work/tmp/openmp-examples/vmulsum ``` ### Point to the installed AOMP by setting AOMP environment variable ``` -export AOMP=/opt/rocm/aomp +export AOMP=/usr/lib/aomp ``` ### Make Instructions diff --git a/docs/UBUNTUINSTALL.md b/docs/UBUNTUINSTALL.md index dff64756e..ad7ab2fe8 100644 --- a/docs/UBUNTUINSTALL.md +++ b/docs/UBUNTUINSTALL.md @@ -2,13 +2,13 @@ On Ubuntu 18.04 LTS (bionic beaver), run these commands: ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-0/aomp_Ubuntu1804_0.7-0_amd64.deb -sudo dpkg -i aomp_Ubuntu1804_0.7-0_amd64.deb +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-1/aomp_Ubuntu1804_0.7-1_amd64.deb +sudo dpkg -i aomp_Ubuntu1804_0.7-1_amd64.deb ``` On Ubuntu 16.04, run these commands: ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-0/aomp_Ubuntu1604_0.7-0_amd64.deb -sudo dpkg -i aomp_Ubuntu1604_0.7-0_amd64.deb +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-1/aomp_Ubuntu1604_0.7-1_amd64.deb +sudo dpkg -i aomp_Ubuntu1604_0.7-1_amd64.deb ``` The AOMP bin directory (which includes the standard clang and llvm binaries) is not intended to be in your PATH for typical operation. @@ -19,13 +19,13 @@ By default, the packages install their content to the release directory /usr/lib To install the debian package without root access into your home directory, you can run these commands.
On Ubuntu 18.04 LTS (bionic beaver): ``` - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-0/aomp_Ubuntu1804_0.7-0_amd64.deb - dpkg -x aomp_Ubuntu1804_0.7-0_amd64.deb /tmp/temproot + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-1/aomp_Ubuntu1804_0.7-1_amd64.deb + dpkg -x aomp_Ubuntu1804_0.7-1_amd64.deb /tmp/temproot ``` On Ubuntu 16.04: ``` - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-0/aomp_Ubuntu1604_0.7-0_amd64.deb - dpkg -x aomp_Ubuntu1604_0.7-0_amd64.deb /tmp/temproot + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-1/aomp_Ubuntu1604_0.7-1_amd64.deb + dpkg -x aomp_Ubuntu1604_0.7-1_amd64.deb /tmp/temproot ``` ``` mv /tmp/temproot/usr $HOME