Skip to content

Commit

Permalink
Update docs/aomp_common_vars for 11.6-1 Release.
Browse files Browse the repository at this point in the history
  • Loading branch information
estewart08 committed Jun 11, 2020
1 parent c07ace5 commit 58cb63b
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 33 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AOMP - V 11.5-0
AOMP - V 11.6-1
==============

This is README.md for https://github.com/ROCM-Developer-Tools/aomp.
Expand All @@ -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 11.5-0](https://github.com/ROCm-Developer-Tools/aomp/releases).
Currently AOMP 11.5-1 is under development.
The last [release is AOMP 11.6-1](https://github.com/ROCm-Developer-Tools/aomp/releases).
Currently AOMP 11.6-2 is under development.


Attention Users! Please use this repository for [issues](https://github.com/ROCm-Developer-Tools/aomp/issues).
Expand Down
6 changes: 3 additions & 3 deletions bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ WARNING: When the build scripts are run with NO arguments (that is, you do not s
The install location is defined by the $AOMP environment variable. The value of AOMP needs to be reserved as a symbolic link.
That is, the physical installation will be in directory $AOMP concatonated with the version string.
The install script will make a symbolic link from the physical directory to the symbolic directory $AOMP.
For example, when building AOMP version 11.5-0 with the default value for AOMP=$HOME/rocm/aomp,
the install scripts will put all files and directories in $HOME/rocm/aomp_11.5-0 and create a symbolic link as follows.
For example, when building AOMP version 11.6-1 with the default value for AOMP=$HOME/rocm/aomp,
the install scripts will put all files and directories in $HOME/rocm/aomp_11.6-1 and create a symbolic link as follows.

```
ln -sf ${AOMP}_11.5-0 ${AOMP}
ln -sf ${AOMP}_11.6-1 ${AOMP}
```
This symbolic link makes it easy to switch between versions of AOMP for testing.
8 changes: 4 additions & 4 deletions bin/aomp_common_vars
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ GITKHRONOS="https://github.com/KhronosGroup"

# These aomp development repositories
AOMP_REPO_NAME=${AOMP_REPO_NAME:-aomp}
AOMP_REPO_BRANCH=${AOMP_REPO_BRANCH:-amd-stg-openmp}
AOMP_REPO_BRANCH=${AOMP_REPO_BRANCH:-aomp-11.6-1}
AOMP_PROJECT_REPO_NAME=${AOMP_PROJECT_REPO_NAME:-amd-llvm-project}
AOMP_PROJECT_REPO_BRANCH=${AOMP_PROJECT_REPO_BRANCH:-amd-stg-openmp}
AOMP_PROJECT_REPO_BRANCH=${AOMP_PROJECT_REPO_BRANCH:-aomp-11.6-1}
AOMP_EXTRAS_REPO_NAME=${AOMP_EXTRAS_REPO_NAME:-aomp-extras}
AOMP_EXTRAS_REPO_BRANCH=${AOMP_EXTRAS_REPO_BRANCH:-amd-stg-openmp}
AOMP_EXTRAS_REPO_BRANCH=${AOMP_EXTRAS_REPO_BRANCH:-aomp-11.6-1}
AOMP_FLANG_REPO_NAME=${AOMP_FLANG_REPO_NAME:-flang}
AOMP_FLANG_REPO_BRANCH=${AOMP_FLANG_REPO_BRANCH:-amd-stg-openmp}
AOMP_FLANG_REPO_BRANCH=${AOMP_FLANG_REPO_BRANCH:-aomp-11.6-1}

# These extra repositories are needed but we cannot update them
AOMP_ROCT_REPO_NAME=${AOMP_ROCT_REPO_NAME:-roct-thunk-interface}
Expand Down
16 changes: 8 additions & 8 deletions docs/NOROOTINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Once installed go to [TESTINSTALL](TESTINSTALL.md) for instructions on getting s
To install the debian package without root access into your home directory, you can run these commands.<br>
On Ubuntu 18.04 LTS (bionic beaver):
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_Ubuntu1804_11.5-0_amd64.deb
dpkg -x aomp_Ubuntu1804_11.5-0_amd64.deb /tmp/temproot
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp_Ubuntu1804_11.6-1_amd64.deb
dpkg -x aomp_Ubuntu1804_11.6-1_amd64.deb /tmp/temproot
```
On Ubuntu 16.04:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_Ubuntu1604_11.5-0_amd64.deb
dpkg -x aomp_Ubuntu1604_11.5-0_amd64.deb /tmp/temproot
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp_Ubuntu1604_11.6-1_amd64.deb
dpkg -x aomp_Ubuntu1604_11.6-1_amd64.deb /tmp/temproot
```
Move to $HOME and set variables:
```
Expand All @@ -30,13 +30,13 @@ 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_11.5-0/aomp_REDHAT_7-11.5-0.x86_64.rpm
rpm2cpio aomp_REDHAT_7-11.5-0.x86_64.rpm | cpio -idmv
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp_REDHAT_7-11.6-1.x86_64.rpm
rpm2cpio aomp_REDHAT_7-11.6-1.x86_64.rpm | cpio -idmv
```
For SLES15-SP1:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_SLES15_SP1-11.5-0.x86_64.rpm
rpm2cpio aomp_SLES15_SP1-11.5-0.x86_64.rpm | cpio -idmv
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp_SLES15_SP1-11.6-1.x86_64.rpm
rpm2cpio aomp_SLES15_SP1-11.6-1.x86_64.rpm | cpio -idmv
```
Move to $HOME and set variables:
```
Expand Down
10 changes: 5 additions & 5 deletions docs/RELEASESOURCEINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ Remember,the aomp spack configuration file is currently missing dependencies, so
To build and install aomp from the release source tarball run these commands:

```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp-11.5-0.tar.gz
tar -xzf aomp-11.5-0.tar.gz
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp-11.6-1.tar.gz
tar -xzf aomp-11.6-1.tar.gz
cd aomp
nohup make &
```
Expand All @@ -117,9 +117,9 @@ 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_11.5-0 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_11.5-0.
The build_aomp.sh script will install into $HOME/rocm/aomp_11.6-1 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_11.6-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_11.0-1.
To enable a backlevel version of AOMP, simply set AOMP to $HOME/rocm/aomp_11.5-0.

## Build AOMP with spack

Expand All @@ -128,7 +128,7 @@ Currently the aomp configuration is not yet in the spack git hub so you must cre

```
wget https://github.com/ROCm-Developer-Tools/aomp/blob/master/bin/package.py
spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp-11.5-0.tar.gz
spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp-11.6-1.tar.gz
spack edit aomp
spack install aomp
```
Expand Down
6 changes: 3 additions & 3 deletions docs/RHELINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ sudo yum install perl-Digest-MD5
```
### Download and Install
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_REDHAT_7-11.5-0.x86_64.rpm
sudo rpm -i aomp_REDHAT_7-11.5-0.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp_REDHAT_7-11.6-1.x86_64.rpm
sudo rpm -i aomp_REDHAT_7-11.6-1.x86_64.rpm
```
If CUDA is not installed the installation may cancel, to bypass this:
```
sudo rpm -i --nodeps aomp_REDHAT_7-11.5-0.x86_64.rpm
sudo rpm -i --nodeps aomp_REDHAT_7-11.6-1.x86_64.rpm
```
Confirm AOMP environment variable is set:
```
Expand Down
5 changes: 2 additions & 3 deletions docs/SLES15INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# AOMP SUSE SLES-15-SP1 Install
<b>The SLES package for AOMP 11.5-0, is pending due to limited office access.</b>
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_11.5-0/aomp_SLES15_SP1-11.5-0.x86_64.rpm
sudo rpm -i aomp_SLES15_SP1-11.5-0.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp_SLES15_SP1-11.6-1.x86_64.rpm
sudo rpm -i aomp_SLES15_SP1-11.6-1.x86_64.rpm
```
Confirm AOMP environment variable is set:
```
Expand Down
8 changes: 4 additions & 4 deletions docs/UBUNTUINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatic

On Ubuntu 18.04 LTS (bionic beaver), run these commands:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_Ubuntu1804_11.5-0_amd64.deb
sudo dpkg -i aomp_Ubuntu1804_11.5-0_amd64.deb
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp_Ubuntu1804_11.6-1_amd64.deb
sudo dpkg -i aomp_Ubuntu1804_11.6-1_amd64.deb
```
On Ubuntu 16.04, run these commands:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_Ubuntu1604_11.5-0_amd64.deb
sudo dpkg -i aomp_Ubuntu1604_11.5-0_amd64.deb
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.6-1/aomp_Ubuntu1604_11.6-1_amd64.deb
sudo dpkg -i aomp_Ubuntu1604_11.6-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.

Expand Down

0 comments on commit 58cb63b

Please sign in to comment.