diff --git a/README.md b/README.md index b990f3ee8..73af9b0ba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -AOMP - V 14.0-0 +AOMP - V 14.0-1 ============== This is README.md for https://github.com/ROCM-Developer-Tools/aomp. @@ -8,8 +8,8 @@ This is the base repository for AOMP. Use this github repository for documentation, and [examples](https://github.com/ROCm-Developer-Tools/aomp/tree/master/examples). -The last [release is AOMP 14.0-0](https://github.com/ROCm-Developer-Tools/aomp/releases). -Currently AOMP 14.0-1 is under development. +The last [release is AOMP 14.0-1](https://github.com/ROCm-Developer-Tools/aomp/releases). +Currently AOMP 14.0-2 is under development. Attention Users! Please use this repository for [issues](https://github.com/ROCm-Developer-Tools/aomp/issues). Do not put issues in any of the source code repositories. diff --git a/bin/README.md b/bin/README.md index 368474a05..a98d9b11d 100644 --- a/bin/README.md +++ b/bin/README.md @@ -59,8 +59,8 @@ These are some important environment variables and their default values. | AOMP | $HOME/rocm/aomp | Where AOMP is installed and tested | AOMP_REPOS | $HOME/git/aomp14.0 | The base directory for all AOMP build repositories | AOMP_STANDALONE_BUILD | 1 | Build all components, do NOT use installed ROCm -| AOMP_VERSION | 14.0 | Will change to 14.1 when LLVM 14 stablizes. -| AOMP_VERSION_MOD | 1 | This imples the next release will be AOMP_14.0-1. +| AOMP_VERSION | 14.0 | Clang version. +| AOMP_VERSION_MOD | 2 | This implies the next release will be AOMP_14.0-2. | AOMP_VERSION_STRING | $AOMP_VERSION-$AOMP_VERSION_MOD | | GFXLIST | gfx700 gfx701 gfx801 gfx803 | List of AMDGPU gpus to build for | | gfx900 gfx902 gfx906 gfx908 | @@ -243,17 +243,17 @@ The install location is defined by the $AOMP environment variable. The value of That is, the physical installation will be in directory name formed by concatonating the version string to the value of $AOMP. The "build_project.sh install" script will make a symbolic link from the physical directory to the symbolic directory $AOMP. The default value for AOMP is $HOME/rocm/aomp. -For example, when building AOMP version 14.0-0 the install scripts will put all files and directories -in $HOME/rocm/aomp_14.0-0 and create a symbolic link as follows: +For example, when building AOMP version 14.0-1 the install scripts will put all files and directories +in $HOME/rocm/aomp_14.0-1 and create a symbolic link as follows: ``` -ln -sf ${AOMP}_14.0-0 ${AOMP} +ln -sf ${AOMP}_14.0-1 ${AOMP} ``` All testing for AOMP uses the environment variable AOMP to locate the installation. This makes it easy to switch between versions of AOMP for testing by simply changing the environment variable AOMP. You do NOT need to change the symbolic link. -For example, if the aomp symbolic link currently points to aomp_14.0-0 and you want to test aomp_13.0-6, do this: +For example, if the aomp symbolic link currently points to aomp_14.0-1 and you want to test aomp_14.0-0, do this: ``` -export AOMP=$HOME/rocm/aomp_13.0-6 +export AOMP=$HOME/rocm/aomp_14.0-0 ``` The aomp package installs in /usr/lib/aomp_\ and symlinks /usr/lib/aomp to the versioned directory. To test the installed package, set AOMP to /usr/lib/aomp or /usr/lib/aomp_\. diff --git a/bin/debian/changelog b/bin/debian/changelog index 1be7ca081..ca8f4839f 100644 --- a/bin/debian/changelog +++ b/bin/debian/changelog @@ -667,5 +667,7 @@ aomp (14.0-0) UNRELEASED; urgency=medium * Miniqmc, Kokkos, Raja fail to build. * Non-deterministic failures in qmcpack deterministic tests. * Possible incorrect linking of libclang-cpp.so in the build of libomptarget.so. + * + * 14.0-1 -- Greg Rodgers Sun, 14 Nov 2021 21:58:08 -0600 diff --git a/bin/package.py b/bin/package.py index 291579ab6..b969223d1 100644 --- a/bin/package.py +++ b/bin/package.py @@ -12,10 +12,10 @@ class Aomp(MakefilePackage): """ llvm openmp compiler from AMD""" homepage = "https://github.com/ROCm-Developer-Tools/aomp" - url = "https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp-14.0-0.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp-14.0-1.tar.gz" # Fixme: this will be adjusted when spack create is called. When copying over to your own package.py omit this line. - version('14.0-0', sha256='7ea4e218b171585441278f3562d97779006b12bc3b5dc201901f2d757226da84') + version('14.0-1', sha256='7ea4e218b171585441278f3562d97779006b12bc3b5dc201901f2d757226da84') family = 'compiler' diff --git a/docs/CENTOSINSTALL.md b/docs/CENTOSINSTALL.md index a4276eb6d..d7d2408a6 100644 --- a/docs/CENTOSINSTALL.md +++ b/docs/CENTOSINSTALL.md @@ -5,13 +5,13 @@ AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatic ### Download and Install (CentOS 8) ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_CENTOS_8-14.0-0.x86_64.rpm -sudo rpm -i aomp_CENTOS_8-14.0-0.x86_64.rpm +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_CENTOS_8-14.0-1.x86_64.rpm +sudo rpm -i aomp_CENTOS_8-14.0-1.x86_64.rpm ``` ### Download and Install (CentOS 7) ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_REDHAT_7-14.0-0.x86_64.rpm -sudo rpm -i aomp_REDHAT_7-14.0-0.x86_64.rpm +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_REDHAT_7-14.0-1.x86_64.rpm +sudo rpm -i aomp_REDHAT_7-14.0-1.x86_64.rpm ``` Confirm AOMP environment variable is set: ``` diff --git a/docs/NOROOTINSTALL.md b/docs/NOROOTINSTALL.md index 0b459463e..8b28e55c5 100644 --- a/docs/NOROOTINSTALL.md +++ b/docs/NOROOTINSTALL.md @@ -8,13 +8,13 @@ To install the debian package without root access into your home directory, you On Ubuntu 20.04: ``` - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_Ubuntu2004_14.0-0_amd64.deb - dpkg -x aomp_Ubuntu2004_14.0-0_amd64.deb /tmp/temproot + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_Ubuntu2004_14.0-1_amd64.deb + dpkg -x aomp_Ubuntu2004_14.0-1_amd64.deb /tmp/temproot ``` On Ubuntu 18.04 LTS (bionic beaver): ``` - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_Ubuntu1804_14.0-0_amd64.deb - dpkg -x aomp_Ubuntu1804_14.0-0_amd64.deb /tmp/temproot + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_Ubuntu1804_14.0-1_amd64.deb + dpkg -x aomp_Ubuntu1804_14.0-1_amd64.deb /tmp/temproot ``` Move to $HOME and set variables: ``` @@ -31,18 +31,18 @@ To install the rpm package without root access into your home directory, you can ``` For Red Hat: ``` - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_REDHAT_7-14.0-0.x86_64.rpm - rpm2cpio aomp_REDHAT_7-14.0-0.x86_64.rpm | cpio -idmv + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_REDHAT_7-14.0-1.x86_64.rpm + rpm2cpio aomp_REDHAT_7-14.0-1.x86_64.rpm | cpio -idmv ``` For SLES15-SP1: ``` - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_SLES15_SP1-14.0-0.x86_64.rpm - rpm2cpio aomp_SLES15_SP1-14.0-0.x86_64.rpm | cpio -idmv + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_SLES15_SP1-14.0-1.x86_64.rpm + rpm2cpio aomp_SLES15_SP1-14.0-1.x86_64.rpm | cpio -idmv ``` For CentOS (RHEL 7 rpm is recommended for CentOS 7): ``` - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_CENTOS_8-14.0-0.x86_64.rpm - rpm2cpio aomp_CENTOS_8-14.0-0.x86_64.rpm | cpio -idmv + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_CENTOS_8-14.0-1.x86_64.rpm + rpm2cpio aomp_CENTOS_8-14.0-1.x86_64.rpm | cpio -idmv ``` Move to $HOME and set variables: ``` diff --git a/docs/RELEASESOURCEINSTALL.md b/docs/RELEASESOURCEINSTALL.md index 487c4a88c..f7647e515 100644 --- a/docs/RELEASESOURCEINSTALL.md +++ b/docs/RELEASESOURCEINSTALL.md @@ -14,8 +14,8 @@ To build AOMP from source you must: 1. Install certain distribution packages, 2. To build and install aomp from the release source tarball run these commands: ``` - wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp-14.0-0.tar.gz - tar -xzf aomp-14.0-0.tar.gz + wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp-14.0-1.tar.gz + tar -xzf aomp-14.0-1.tar.gz cd aomp14.0 nohup make & ``` @@ -30,17 +30,17 @@ If you set the environment variable AOMP, the Makefile will install to that dire Otherwise, the Makefile will install into /usr/local. So you must have authorization to write into /usr/local if you do not set the environment variable AOMP. Let's assume you set the environment variable AOMP to "$HOME/rocm/aomp" in .bash_profile. -The build_aomp.sh script will install into $HOME/rocm/aomp_14.0-0 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_14.0-0. +The build_aomp.sh script will install into $HOME/rocm/aomp_14.0-1 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_14.0-1. This feature allows multiple versions of AOMP to be installed concurrently. -To enable a backlevel version of AOMP, simply set AOMP to $HOME/rocm/aomp_13.0-6. +To enable a backlevel version of AOMP, simply set AOMP to $HOME/rocm/aomp_14.0-0. ## Build AOMP with spack Assuming your have installed the [prerequisites](SOURCEINSTALL_PREREQUISITE.md), use these commands to fetch the source and build aomp. Currently the aomp configuration is not yet in the spack git hub so you must create the spack package first. ``` - wget https://github.com/ROCm-Developer-Tools/aomp/blob/aomp-14.0-0/bin/package.py - spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp-14.0-0.tar.gz + wget https://github.com/ROCm-Developer-Tools/aomp/blob/aomp-14.0-1/bin/package.py + spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp-14.0-1.tar.gz spack edit aomp spack install aomp ``` diff --git a/docs/RHELINSTALL.md b/docs/RHELINSTALL.md index 6fe3b69cb..c4d5d35d2 100644 --- a/docs/RHELINSTALL.md +++ b/docs/RHELINSTALL.md @@ -8,12 +8,12 @@ sudo yum install perl-Digest-MD5 perl-URI-Encode ``` ### Download and Install ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_REDHAT_7-14.0-0.x86_64.rpm -sudo rpm -i aomp_REDHAT_7-14.0-0.x86_64.rpm +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_REDHAT_7-14.0-1.x86_64.rpm +sudo rpm -i aomp_REDHAT_7-14.0-1.x86_64.rpm ``` If CUDA is not installed the installation may cancel, to bypass this: ``` -sudo rpm -i --nodeps aomp_REDHAT_7-14.0-0.x86_64.rpm +sudo rpm -i --nodeps aomp_REDHAT_7-14.0-1.x86_64.rpm ``` Confirm AOMP environment variable is set: ``` diff --git a/docs/SLES15INSTALL.md b/docs/SLES15INSTALL.md index cb19ce7ac..f394206f6 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_14.0-0/aomp_SLES15_SP1-14.0-0.x86_64.rpm -sudo rpm -i aomp_SLES15_SP1-14.0-0.x86_64.rpm +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_SLES15_SP1-14.0-1.x86_64.rpm +sudo rpm -i aomp_SLES15_SP1-14.0-1.x86_64.rpm ``` Confirm AOMP environment variable is set: ``` diff --git a/docs/SOURCEINSTALL.md b/docs/SOURCEINSTALL.md index 5844702a0..1427c498d 100644 --- a/docs/SOURCEINSTALL.md +++ b/docs/SOURCEINSTALL.md @@ -1,4 +1,4 @@ -# Source Install V 14.0-0 +# Source Install V 14.0-1 Build and install from sources is possible. However, the source build for AOMP is complex for several reasons. - Many repos are required. @@ -43,7 +43,7 @@ Here are the commands to do a source build of AOMP: Release Branch: ``` - git clone -b aomp-14.0-0 https://github.com/ROCm-Developer-Tools/aomp + git clone -b aomp-14.0-1 https://github.com/ROCm-Developer-Tools/aomp ``` Clone and build: ``` @@ -88,12 +88,12 @@ MANIFEST FILE: /work/grodgers/git/aomp14.0/aomp/bin/../manifests/aomp_14.0.xml To build a previous release of AOMP: 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. -These commands will build a previous release of AOMP such as aomop-13.0-6. +These commands will build a previous release of AOMP such as aomop-14.0-0. ``` cd $AOMP_REPOS/aomp/bin - export AOMP_VERSION=13.0 + export AOMP_VERSION=14.0 export AOMP_REPOS=$HOME/git/aomp${AOMP_VERSION} - git checkout aomp-13.0-6 + git checkout aomp-14.0-0 git pull export AOMP_CHECK_GIT_BRANCH=0 //Tags will be used to checkout various repos. This will ignore the detached head state to avoid build errors. ./clone_aomp.sh diff --git a/docs/UBUNTUINSTALL.md b/docs/UBUNTUINSTALL.md index 2797cb5cc..dc643dad4 100644 --- a/docs/UBUNTUINSTALL.md +++ b/docs/UBUNTUINSTALL.md @@ -3,14 +3,14 @@ AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatic On Ubuntu 20.04, run these commands: ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_Ubuntu2004_14.0-0_amd64.deb -sudo dpkg -i aomp_Ubuntu2004_14.0-0_amd64.deb +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_Ubuntu2004_14.0-1_amd64.deb +sudo dpkg -i aomp_Ubuntu2004_14.0-1_amd64.deb ``` On Ubuntu 18.04 LTS (bionic beaver), run these commands: ``` -wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-0/aomp_Ubuntu1804_14.0-0_amd64.deb -sudo dpkg -i aomp_Ubuntu1804_14.0-0_amd64.deb +wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_14.0-1/aomp_Ubuntu1804_14.0-1_amd64.deb +sudo dpkg -i aomp_Ubuntu1804_14.0-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.