Changeset 336

Timestamp:

03/10/15 12:12:38 (9 years ago)

Author:

bas

Message:

preparing for new pbs_python release that supports torque 5.x, see #47

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• README (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• pbs_python.spec (modified) (1 diff)
• setup.py.in (modified) (1 diff)

trunk/CHANGES

@@ +1 @@
+=========== 4.6.0
+ * Added support for torque version 5.x. Note: the rm interface does not work for me on debian wheezy.
+   Author: Bas van der Vlies
+
 =========== 4.5.0
  * new_rack_pbsmon.py: Added option -j/--joby. It will show the nodes that are used by the specified job

trunk/README

@@ -15 +15 @@
 The Python wrapper class is tested on:
 
-  - Intel cluster debian GNU/LINUX woody/sarge OPENPBS 2.3.16, 
-    TORQUE 1.0.1p4, 1.1.0p4 and up
-
-  - For X86_64 systems you have to compile torque/openpbs with 
-    the -fPIC option. Else you can not build the python module
-
-  - TRU64 system, NOTE: must rename libnet.a to libpbs_net.a and 
-    edit setup.py to reflect the change. There is also a system wide 
-    libnet.so.
-
+  - LISA cluster debian wheezy, torque 2.5.7
+  - LTC test cluster debian wheezy, torque 5.0.1
+  - LTC test cluster centos 6, torque 5.0.1
   - It should run on different OSes.
-
-In the past our Alpha cluster was redhat (6.2)  and we had to 
-add '-lots' to the LIBS line
 
 -- Compile and install the package: (Require python 2.1 and higher)
 
-  As for python version 1.6 and higher the procedure is:
+  As for python version 2.1 and higher the procedure is:
     ./configure
     make
@@ -72 +62 @@
 
 --
-********************************************************************
-*                                                                  *
-*  Bas van der Vlies                     e-mail: basv@sara.nl      *
-*  SARA - Academic Computing Services    phone:  +31 20 592 8012   *
-*  Kruislaan 415                         fax:    +31 20 6683167    *
-*  1098 SJ Amsterdam                     WWW:    www.sara.nl       *
-*                                                                  *
-********************************************************************
+Bas van der Vlies
+| Operations, Support & Development | SURFsara | Science Park 140 | 1098 XG  Amsterdam
+| T +31 (0) 20 800 1300  | bas.vandervlies@surfsara.nl | www.surfsara.nl |

trunk/debian/changelog

@@ +1 @@
+pbs-python (4.6.0-1) UNRELEASED; urgency=low
+
+  * Added support torque 5.X
+
+ -- Bas van der Vlies <bas.vandervlies@surfsara.nl>  Tue, 10 Mar 2015 12:03:25 +0100
+
 pbs-python (4.4.1-1) unstable; urgency=low
 

trunk/pbs_python.spec

@@ -4 +4 @@
 
 Name: pbs_python
-Version: 4.4.1
+Version: 4.6.0
 Release: 1%{?dist}
 License: See LICENSE

trunk/setup.py.in

@@ -34 +34 @@
 except OSError:
     pass
+
+if LooseVersion(VERSION) >= LooseVersion('5.0'):
+
+    inc=os.environ.get('PBS_PYTHON_INCLUDEDIR','/usr/include/torque')
+    os.environ['CC']='g++'
+    os.environ['CFLAGS']=' '.join(os.environ.get('CFLAGS','').split(' ')+['-I%s'%inc]) 
+    
+    if not os.path.exists(os.path.join(inc,'log.h')):
+        print 'Failed to find log.h in include dir %s. (Set include dir via PBS_PYTHON_INCLUDEDIR variable)'%inc
+        sys.exit(2)
+  
+    for fn in glob.glob('*.h'):
+        os.remove(fn)
+     
+    TORQUE_VERSION='TORQUE_5'
+    SOURCE_FILE='src/5.x/pbs_wrap.cxx'
+
+    os.symlink('5.X/pbs.py', 'pbs.py')
 
 if LooseVersion(VERSION) >= LooseVersion('4.2'):