Author: tlinnet
Date: Mon Oct  3 12:56:19 2016
New Revision: 28245

URL: http://svn.gna.org/viewcvs/relax?rev=28245&view=rev
Log:
More changing to deployment scripts.

Added:
    
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh
      - copied, changed from r28240, 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh
Modified:
    
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh
    
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh

Modified: 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh
URL: 
http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh?rev=28245&r1=28244&r2=28245&view=diff
==============================================================================
--- 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh   
    (original)
+++ 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh   
    Mon Oct  3 12:56:19 2016
@@ -19,6 +19,7 @@
   sudo yum -y install subversion scons 
 
   # Install xmgrace. Add the EPEL repository.
+  sudo yum -y install wget curl
   wget 
http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
   sudo rpm -ivh epel-release-6-8.noarch.rpm
   sudo yum -y install grace
@@ -26,6 +27,9 @@
   # mpi4py
   sudo yum -y install mpi4py-openmpi
   sudo yum info mpi4py-openmpi
+
+  # wxPython for GUI
+  sudo yum -y install wxPython
 }
 
 # Install python packages
@@ -76,6 +80,7 @@
 
 # Get latest compiled version of relax
 function getlatest {
+  sudo yum -y install bzip2
   cd $HOME
   if [ ! -d "$HOME/relax-$VREL" ]; then
     curl http://download.gna.org/relax/relax-$VREL.GNU-Linux.x86_64.tar.bz2 -o 
relax-$VREL.GNU-Linux.x86_64.tar.bz2
@@ -115,9 +120,11 @@
   # Print info
   which relax_$VREL
   relax_$VREL -i
+  #mpirun --report-bindings --np 2 relax_$VREL --multi='mpi4py' --version
 
   which relax_trunk
   relax_trunk -i
+  #mpirun --report-bindings --np 2 relax_trunk --multi='mpi4py' --version
 }
 
 # Combine functions

Modified: 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh
URL: 
http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh?rev=28245&r1=28244&r2=28245&view=diff
==============================================================================
--- 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh
        (original)
+++ 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh
        Mon Oct  3 12:56:19 2016
@@ -131,6 +131,7 @@
 
 # Get latest compiled version of relax
 function getlatest {
+  sudo yum -y install bzip2
   cd $HOME
   if [ ! -d "$HOME/relax-$VREL" ]; then
     curl http://download.gna.org/relax/relax-$VREL.GNU-Linux.x86_64.tar.bz2 -o 
relax-$VREL.GNU-Linux.x86_64.tar.bz2
@@ -170,9 +171,11 @@
   # Print info
   which relax_$VREL
   relax_$VREL -i
+  #mpirun --report-bindings --np 2 relax_$VREL --multi='mpi4py' --version
 
   which relax_trunk
   relax_trunk -i
+  #mpirun --report-bindings --np 2 relax_trunk --multi='mpi4py' --version
 }
 
 # Combine functions

Copied: 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh 
(from r28240, 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh?p2=trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh&p1=trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh&r1=28240&r2=28245&rev=28245&view=diff
==============================================================================
--- 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh   
    (original)
+++ 
trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh   
    Mon Oct  3 12:56:19 2016
@@ -9,7 +9,7 @@
 
   # Install for running relax in multiple CPU mode
   sudo yum -y install openmpi-devel
-  echo "module load openmpi-1.10-x86_64" >> $HOME/.bash_profile
+  echo "module load mpi/openmpi-x86_64" >> $HOME/.bash_profile
 
   # Install dependencies
   sudo yum -y install numpy
@@ -19,13 +19,17 @@
   sudo yum -y install subversion scons 
 
   # Install xmgrace. Add the EPEL repository.
-  wget 
http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
-  sudo rpm -ivh epel-release-6-8.noarch.rpm
+  sudo yum -y install wget curl
+  wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+  sudo yum -y install epel-release-latest-7.noarch.rpm
   sudo yum -y install grace
 
   # mpi4py
   sudo yum -y install mpi4py-openmpi
   sudo yum info mpi4py-openmpi
+
+  # wxPython for GUI
+  sudo yum -y install wxPython
 }
 
 # Install python packages
@@ -76,6 +80,7 @@
 
 # Get latest compiled version of relax
 function getlatest {
+  sudo yum -y install bzip2
   cd $HOME
   if [ ! -d "$HOME/relax-$VREL" ]; then
     curl http://download.gna.org/relax/relax-$VREL.GNU-Linux.x86_64.tar.bz2 -o 
relax-$VREL.GNU-Linux.x86_64.tar.bz2
@@ -115,9 +120,11 @@
   # Print info
   which relax_$VREL
   relax_$VREL -i
+  #mpirun --report-bindings --np 2 relax_$VREL --multi='mpi4py' --version
 
   which relax_trunk
   relax_trunk -i
+  #mpirun --report-bindings --np 2 relax_trunk --multi='mpi4py' --version
 }
 
 # Combine functions


_______________________________________________
relax (http://www.nmr-relax.com)

This is the relax-commits mailing list
relax-commits@gna.org

To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits

Reply via email to