Update docs, changelog for 13.0-6.

ROCm · Aug 23, 2021 · c7d930a · c7d930a
1 parent e796308
commit c7d930a
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-AOMP - V 13.0-5
+AOMP - V 13.0-6
 ==============
 
 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 13.0-5](https://github.com/ROCm-Developer-Tools/aomp/releases).
-Currently AOMP 13.0-6 is under development.
+The last [release is AOMP 13.0-6](https://github.com/ROCm-Developer-Tools/aomp/releases).
+Currently AOMP 13.1-0 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
@@ -60,7 +60,7 @@ These are some important environment variables and their default values.
 | AOMP_REPOS            | $HOME/git/aomp13   | The base directory for all AOMP build repositories
 | AOMP_STANDALONE_BUILD | 1                  | Build all components, do NOT use installed ROCm
 | AOMP_VERSION          | 13.0               | Will change to 13.1 when LLVM 13 stablizes.
-| AOMP_VERSION_MOD      | 4                  | This imples the next release will be AOMP_13.0-4.
+| AOMP_VERSION_MOD      | 6                  | This imples the next release will be AOMP_13.0-6.
 | AOMP_VERSION_STRING   | $AOMP_VERSION-$AOMP_VERSION_MOD |
 | GFXLIST               | gfx700 gfx701 gfx801 gfx803     | List of AMDGPU gpus to build for
 |                       | gfx900 gfx902 gfx906 gfx908     |
@@ -249,17 +249,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 13.0-5 the install scripts will put all files and directories
-in $HOME/rocm/aomp_13.0-5 and create a symbolic link as follows:
+For example, when building AOMP version 13.0-6 the install scripts will put all files and directories
+in $HOME/rocm/aomp_13.0-6 and create a symbolic link as follows:
 
 ```
-ln -sf ${AOMP}_13.0-5 ${AOMP}
+ln -sf ${AOMP}_13.0-6 ${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_13.0-5 and you want to test aomp_13.0-4, do this:
+For example, if the aomp symbolic link currently points to aomp_13.0-6 and you want to test aomp_13.0-5, do this:
 
 ```
-export AOMP=$HOME/rocm/aomp_13.0-4
+export AOMP=$HOME/rocm/aomp_13.0-5
 ```
 
 The aomp package installs in /usr/lib/aomp_\<version_string\> and symlinks /usr/lib/aomp to the versioned directory. To test the installed package, set AOMP to /usr/lib/aomp or /usr/lib/aomp_\<version_string\>.

diff --git a/bin/debian/changelog b/bin/debian/changelog
@@ -1,4 +1,4 @@
-aomp (13.0-5) UNRELEASED; urgency=medium
+aomp (13.0-6) UNRELEASED; urgency=medium
 
   * Initial release of aomp is 0.3-2
   *   Please see example in /usr/lib/aomp/examples/vmuldemo 
@@ -644,5 +644,9 @@ aomp (13.0-5) UNRELEASED; urgency=medium
   *  9 Clang lit test failures
   *  Long build times when large numbers of archive libraries are needed because toolchain must
   *       unbundle the archive for device linking.
+  *
+  *  13.0-6
+  *   Update to ROCm 4.3 sources.
+  *   Flang cmake race condition fixed.
 
  -- Greg Rodgers <[email protected]>  Wed, 28 Jul 2021 11:27:13 -0500
diff --git 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_13.0-5/aomp-13.0-5.tar.gz"
+    url      = "https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-5/aomp-13.0-6.tar.gz"
 
     # Fixme: this will be adjusted when spack create is called. When copying over to your own package.py omit this line.
-    version('13.0-5', sha256='7ea4e218b171585441278f3562d97779006b12bc3b5dc201901f2d757226da84')
+    version('13.0-6', sha256='7ea4e218b171585441278f3562d97779006b12bc3b5dc201901f2d757226da84')
 
     family = 'compiler'
 

diff --git a/docs/CENTOSINSTALL.md b/docs/CENTOSINSTALL.md
@@ -5,8 +5,8 @@ AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatic
 
 ### Download and Install
 ```
-wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-5/aomp_CENTOS_8-13.0-5.x86_64.rpm
-sudo rpm -i aomp_CENTOS_8-13.0-5.x86_64.rpm
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_CENTOS_8-13.0-6.x86_64.rpm
+sudo rpm -i aomp_CENTOS_8-13.0-6.x86_64.rpm
 ```
 Confirm AOMP environment variable is set:
 ```

diff --git 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_13.0-5/aomp_Ubuntu2004_13.0-5_amd64.deb
-   dpkg -x aomp_Ubuntu2004_13.0-5_amd64.deb /tmp/temproot
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_Ubuntu2004_13.0-6_amd64.deb
+   dpkg -x aomp_Ubuntu2004_13.0-6_amd64.deb /tmp/temproot
 ```
 On Ubuntu 18.04 LTS (bionic beaver):
 ```
-   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-5/aomp_Ubuntu1804_13.0-5_amd64.deb
-   dpkg -x aomp_Ubuntu1804_13.0-5_amd64.deb /tmp/temproot
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_Ubuntu1804_13.0-6_amd64.deb
+   dpkg -x aomp_Ubuntu1804_13.0-6_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_13.0-5/aomp_REDHAT_7-13.0-5.x86_64.rpm
-   rpm2cpio aomp_REDHAT_7-13.0-5.x86_64.rpm | cpio -idmv
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_REDHAT_7-13.0-6.x86_64.rpm
+   rpm2cpio aomp_REDHAT_7-13.0-6.x86_64.rpm | cpio -idmv
 ```
 For SLES15-SP1:
 ```
-   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-5/aomp_SLES15_SP1-13.0-5.x86_64.rpm
-   rpm2cpio aomp_SLES15_SP1-13.0-5.x86_64.rpm | cpio -idmv
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_SLES15_SP1-13.0-6.x86_64.rpm
+   rpm2cpio aomp_SLES15_SP1-13.0-6.x86_64.rpm | cpio -idmv
 ```
 For CentOS:
 ```
-   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-5/aomp_CENTOS_8-13.0-5.x86_64.rpm
-   rpm2cpio aomp_CENTOS_8-13.0-5.x86_64.rpm | cpio -idmv
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_CENTOS_8-13.0-6.x86_64.rpm
+   rpm2cpio aomp_CENTOS_8-13.0-6.x86_64.rpm | cpio -idmv
 ```
 Move to $HOME and set variables:
 ```

diff --git 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_13.0-5/aomp-13.0-5.tar.gz
-   tar -xzf aomp-13.0-5.tar.gz
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp-13.0-6.tar.gz
+   tar -xzf aomp-13.0-6.tar.gz
    cd aomp13
    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_13.0-5 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_13.0-5.
+The build_aomp.sh script will install into $HOME/rocm/aomp_13.0-6 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_13.0-6.
 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-4.
+To enable a backlevel version of AOMP, simply set AOMP to $HOME/rocm/aomp_13.0-5.
 
 ## 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-13.0-5/bin/package.py
-   spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-5/aomp-13.0-5.tar.gz
+   wget https://github.com/ROCm-Developer-Tools/aomp/blob/aomp-13.0-6/bin/package.py
+   spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp-13.0-6.tar.gz
    spack edit aomp
    spack install aomp
 ```

diff --git 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_13.0-5/aomp_REDHAT_7-13.0-5.x86_64.rpm
-sudo rpm -i aomp_REDHAT_7-13.0-5.x86_64.rpm
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_REDHAT_7-13.0-6.x86_64.rpm
+sudo rpm -i aomp_REDHAT_7-13.0-6.x86_64.rpm
 ```
 If CUDA is not installed the installation may cancel, to bypass this:
 ```
-sudo rpm -i --nodeps aomp_REDHAT_7-13.0-5.x86_64.rpm
+sudo rpm -i --nodeps aomp_REDHAT_7-13.0-6.x86_64.rpm
 ```
 Confirm AOMP environment variable is set:
 ```

diff --git 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_13.0-5/aomp_SLES15_SP1-13.0-5.x86_64.rpm
-sudo rpm -i aomp_SLES15_SP1-13.0-5.x86_64.rpm
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_SLES15_SP1-13.0-6.x86_64.rpm
+sudo rpm -i aomp_SLES15_SP1-13.0-6.x86_64.rpm
 ```
 Confirm AOMP environment variable is set:
 ```

diff --git a/docs/SOURCEINSTALL.md b/docs/SOURCEINSTALL.md
@@ -1,4 +1,4 @@
-# Source Install V 13.0-5
+# Source Install V 13.0-6
 
 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.
@@ -11,22 +11,48 @@ Build and install from sources is possible.  However, the source build for AOMP
 To build AOMP from source you must: 1. Install certain distribution packages, 2. Build CMake 3.13.4 from source 3. ensure the KFD kernel module is installed and operating, 4. create the Unix video group, and 5. install spack if required. [This link](SOURCEINSTALL_PREREQUISITE.md) provides instructions to satisfy all the AOMP source build dependencies.
 
 ## Clone and Build AOMP
+```
+   cd $HOME ; mkdir -p git/aomp13 ; cd git/aomp13
+   git clone https://github.com/rocm-developer-tools/aomp
+   cd $HOME/git/aomp13/aomp/bin
+```
+
+<b>Choose a Build Version (Development or Release)</b>
+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.
+
+<b>For the Development Branch :</b>
+```
+   git checkout aomp-dev
+   git pull
+```
+Starting with AOMP 13.1, AOMP uses the repo command instead of a long sequence of git clone commands.  One cannot use git clone to fetch aomp because this is not compatible with how repo command works.  So a new script called init\_aomp\_repos.sh will do the initial fetch of the repositories.
 
-Starting with AOMP 13.1, AOMP uses the repo command instead of a long sequence of git clone commands.
-One cannot use git clone to fetch aomp because this is not compatible with how repo command works.
-So a new script called init\_aomp\_repos.sh will do the initial fetch of the repositories.
 Here are the commands to do a source build of AOMP_13.1-x.
+
 ```
    cd /tmp
    export AOMP_VERSION=13.1
    export AOMP_REPOS=$HOME/git/aomp${AOMP_VERSION}
    wget https://github.com/ROCm-Developer-Tools/aomp/raw/aomp-dev/init_aomp_repos.sh
    ./init_aomp_repos.sh
-   $AOMP_REPOS/aomp/bin/clone_aomp.sh
    nohup $AOMP_REPOS/aomp/bin/build_aomp.sh &
 ```
 
-Depending on your system, the last three commands could take a very long time. For more information, please refer to the AOMP developers README file located [HERE](../bin/README.md).
+If instead, you want to build from the sources of a previous release such as 13.0-6 that is possible as well.
+
+<b>For the Release Branch:</b>
+```
+   git checkout aomp-13.0-6
+   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.
+```
+<b>Clone and Build:</b>
+```
+   ./clone_aomp.sh
+   ./build_aomp.sh
+```
+
+Depending on your system, the last two commands could take a very long time. For more information, please refer to the AOMP developers README file located [HERE](../bin/README.md).
 
 You only need to do the checkout/pull in the AOMP repository. The file "bin/aomp_common_vars" lists the branches of each repository for a particular AOMP release. In the master branch of AOMP, aomp_common_vars lists the development branches. It is a good idea to run clone_aomp.sh twice after you checkout a release to be sure you pulled all the checkouts for a particular release.
 

diff --git 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_13.0-5/aomp_Ubuntu2004_13.0-5_amd64.deb
-sudo dpkg -i aomp_Ubuntu2004_13.0-5_amd64.deb
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_Ubuntu2004_13.0-6_amd64.deb
+sudo dpkg -i aomp_Ubuntu2004_13.0-6_amd64.deb
 ```
 
 On Ubuntu 18.04 LTS (bionic beaver), run these commands:
 ```
-wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-5/aomp_Ubuntu1804_13.0-5_amd64.deb
-sudo dpkg -i aomp_Ubuntu1804_13.0-5_amd64.deb
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-6/aomp_Ubuntu1804_13.0-6_amd64.deb
+sudo dpkg -i aomp_Ubuntu1804_13.0-6_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.