Skip to content

Commit

Permalink
Update docs for 11.0-1 release. Updated aomp_common_vars with proper …
Browse files Browse the repository at this point in the history
…repo tags. (#94)

Co-authored-by: Ethan Stewart <ethan.stewart@amd.com>
  • Loading branch information
estewart08 and estewart08 authored Apr 7, 2020
1 parent 189506a commit 6594544
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 35 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 0.7-7
AOMP - V 11.0-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 0.7-7](https://github.com/ROCm-Developer-Tools/aomp/releases).
Currently AOMP 11.0-0 is under development.
The last [release is AOMP 11.0-1](https://github.com/ROCm-Developer-Tools/aomp/releases).
Currently AOMP 11.5-0 is under development.


Attention Users! Please use this repository for [issues](https://github.com/ROCm-Developer-Tools/aomp/issues).
Expand Down
8 changes: 4 additions & 4 deletions bin/aomp_common_vars
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,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:-rel_11.0-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.0-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.0-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.0-1}

# These extra repositories are needed but we cannot update them
AOMP_ROCT_REPO_NAME=${AOMP_ROCT_REPO_NAME:-roct-thunk-interface}
Expand Down
19 changes: 16 additions & 3 deletions bin/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aomp (0.7-6) UNRELEASED; urgency=medium
aomp (11.0-1) UNRELEASED; urgency=medium

* Initial release of aomp is 0.3-2
* Please see example in /usr/lib/aomp/examples/vmuldemo
Expand Down Expand Up @@ -315,5 +315,18 @@ aomp (0.7-6) UNRELEASED; urgency=medium
* Added \$ORIGIN to cmake rpath install in build scripts
* Added new patch system to allow for unmodified repos after build is complete
* Added support for gfx908

-- Greg Rodgers <Gregory.Rodgers@amd.com> Tue, 07 Jan 2020 12:51:24 -0600
*
* 11.0-1
* These are the major changes in this release
*
* Rebase to LLVM 11 development trunk as the code base.
* Switch from hip runtime built with hcc to new hip runtime built on top of ROCMclr.
*
* Known issues
*
* aompExtractRegion is not able to process executables built with this release due to the change
* in how offloaded images are embedded in the executable. Should be fixed in next release.
* Issue #89 Linker error (The file was not recognized as a valid object file) when trying to
* link archive file on command line
* Issue #92 hipcc fails when AOMP is not installed in /usr/lib/aomp
-- Greg Rodgers <Gregory.Rodgers@amd.com> Tue, 07 Apr 2020 10:48:19 -0500
12 changes: 6 additions & 6 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_0.7-7/aomp_Ubuntu1804_0.7-7_amd64.deb
dpkg -x aomp_Ubuntu1804_0.7-7_amd64.deb /tmp/temproot
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_Ubuntu1804_11.0-1_amd64.deb
dpkg -x aomp_Ubuntu1804_11.0-1_amd64.deb /tmp/temproot
```
On Ubuntu 16.04:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-7/aomp_Ubuntu1604_0.7-7_amd64.deb
dpkg -x aomp_Ubuntu1604_0.7-7_amd64.deb /tmp/temproot
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_Ubuntu1604_11.0-1_amd64.deb
dpkg -x aomp_Ubuntu1604_11.0-1_amd64.deb /tmp/temproot
```
```
mv /tmp/temproot/usr $HOME
Expand All @@ -26,8 +26,8 @@ The last two commands could be put into your .bash_profile file so you can alway
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-7/aomp_SLES15_SP1-0.7-7.x86_64.rpm
rpm2cpio aomp_SLES15_SP1-0.7-7.x86_64.rpm | cpio -idmv
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_REDHAT_7-11.0-1.x86_64.rpm
rpm2cpio aomp_REDHAT_7-11.0-1.x86_64.rpm | cpio -idmv
mv /tmp/temproot/usr/lib $HOME
export PATH=$PATH:$HOME/rocm/aomp/bin
export AOMP=$HOME/rocm/aomp
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_0.7-7/aomp-0.7-7.tar.gz
tar -xzf aomp-0.7-7.tar.gz
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp-11.0-1.tar.gz
tar -xzf aomp-11.0-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_0.7-7 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_0.7-7.
The build_aomp.sh script will install into $HOME/rocm/aomp_11.0-1 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_11.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_0.7-6.
To enable a backlevel version of AOMP, simply set AOMP to $HOME/rocm/aomp_0.7-7.

## 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_0.7-7/aomp-0.7-7.tar.gz
spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp-11.0-1.tar.gz
spack edit aomp
spack install aomp
```
Expand Down
10 changes: 6 additions & 4 deletions docs/RHELINSTALL.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# AOMP RHEL 7 Install
# AOMP RHEL 7 Install
Currently, we support RHEL 7.4 and RHEL 7.6.

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.<br>
<br><b>The installation may need the following dependency:</b>
```
sudo yum install perl-Digest-MD5
```
### Download and Install
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-7/aomp_REDHAT_7-0.7-7.x86_64.rpm
sudo rpm -i aomp_REDHAT_7-0.7-7.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_REDHAT_7-11.0-1.x86_64.rpm
sudo rpm -i aomp_REDHAT_7-11.0-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-7.x86_64.rpm
sudo rpm -i --nodeps aomp_REDHAT_7-11.0-1.x86_64.rpm
```
Confirm AOMP environment variable is set:
```
Expand Down
5 changes: 3 additions & 2 deletions docs/SLES15INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# AOMP SUSE SLES-15-SP1 Install
<b>The SLES package for AOMP 11.0-1, 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_0.7-7/aomp_SLES15_SP1-0.7-7.x86_64.rpm
sudo rpm -i aomp_SLES15_SP1-0.7-7.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_SLES15_SP1-11.0-1.x86_64.rpm
sudo rpm -i aomp_SLES15_SP1-11.0-1.x86_64.rpm
```
Confirm AOMP environment variable is set:
```
Expand Down
8 changes: 4 additions & 4 deletions docs/SOURCEINSTALL.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Source Install V 11.0-0 (DEV)
# Source Install V 11.5-0 (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.
Expand Down Expand Up @@ -99,17 +99,17 @@ Create a /etc/yum.repos.d/rocm.repo file with the following contents:
```

<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. If instead, you want to build from the sources of a previous release such as 0.7-7 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 11.0-1 that is possible as well.

<b>For the Development Branch:</b>
```
git checkout master
git checkout amd-stg-openmp
git pull
```

<b>For the Release Branch:</b>
```
git checkout rel_0.7-7
git checkout rel_11.0-1
git pull
```
<b>Clone and Build:</b>
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_0.7-7/aomp_Ubuntu1804_0.7-7_amd64.deb
sudo dpkg -i aomp_Ubuntu1804_0.7-7_amd64.deb
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_Ubuntu1804_11.0-1_amd64.deb
sudo dpkg -i aomp_Ubuntu1804_11.0-1_amd64.deb
```
On Ubuntu 16.04, run these commands:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_0.7-7/aomp_Ubuntu1604_0.7-7_amd64.deb
sudo dpkg -i aomp_Ubuntu1604_0.7-7_amd64.deb
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_Ubuntu1604_11.0-1_amd64.deb
sudo dpkg -i aomp_Ubuntu1604_11.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.

Expand Down

0 comments on commit 6594544

Please sign in to comment.