Fixed --number-of-cores for hpux-ia64.

This commit is contained in:
Ole Tange 2015-03-04 00:12:00 +01:00
parent 96cfacb830
commit d65fa2a35d
4 changed files with 22 additions and 10 deletions

View file

@ -1035,7 +1035,7 @@ sub parse_options {
sub init_globals { sub init_globals {
# Defaults: # Defaults:
$Global::version = 20150225; $Global::version = 20150302;
$Global::progname = 'parallel'; $Global::progname = 'parallel';
$Global::infinity = 2**31; $Global::infinity = 2**31;
$Global::debug = 0; $Global::debug = 0;
@ -3315,6 +3315,7 @@ sub which {
'openbsd' => $bsd, 'openbsd' => $bsd,
'solaris' => $sysv, 'solaris' => $sysv,
'svr5' => $sysv, 'svr5' => $sysv,
'syllable' => "echo ps not supported",
); );
} }
$pid_parentpid_cmd{$^O} or ::die_bug("pid_parentpid_cmd for $^O missing"); $pid_parentpid_cmd{$^O} or ::die_bug("pid_parentpid_cmd for $^O missing");
@ -4932,7 +4933,7 @@ sub no_of_cpus_hpux {
# Number of physical CPUs on HP-UX # Number of physical CPUs on HP-UX
# undef if not HP-UX # undef if not HP-UX
my $no_of_cpus = my $no_of_cpus =
(`/usr/bin/mpsched -s 2>&1 | grep 'Locality Domain Count' | awk '{ print \$4 }'`); qx{/usr/bin/mpsched -s 2>&1 | grep 'Locality Domain Count' | awk '{ print \$4 }'};
return $no_of_cpus; return $no_of_cpus;
} }
@ -4941,7 +4942,7 @@ sub no_of_cores_hpux {
# Number of CPU cores on HP-UX # Number of CPU cores on HP-UX
# undef if not HP-UX # undef if not HP-UX
my $no_of_cores = my $no_of_cores =
(`/usr/bin/mpsched -s 2>&1 | grep 'Processor Count' | awk '{ print \$3 }'`); qx{/usr/bin/mpsched -s 2>&1 | perl -ne '/Processor Count\\D+(\\d+)/ and print "\$1\n"'};
return $no_of_cores; return $no_of_cores;
} }

View file

@ -1,10 +1,12 @@
#!/bin/bash #!/bin/bash
P_ALL="vax freebsd solaris openbsd netbsd debian alpha aix redhat hpux ultrix minix qnx irix tru64 openindiana suse solaris-x86 mandriva ubuntu scosysv unixware dragonfly centos miros hurd raspberrypi" # Check servers up on http://www.polarhome.com/service/status/
P_ALL="vax freebsd solaris openbsd netbsd debian alpha aix redhat hpux ultrix minix qnx irix tru64 openindiana suse solaris-x86 mandriva ubuntu scosysv unixware dragonfly centos miros hurd raspberrypi macosx hpux-ia64 syllable"
P_NOTWORKING="vax alpha openstep" P_NOTWORKING="vax alpha openstep"
P_NOTWORKING_YET="ultrix irix" P_NOTWORKING_YET="ultrix irix"
P_WORKING="minix freebsd solaris openbsd netbsd debian aix redhat hpux qnx tru64 openindiana suse solaris-x86 mandriva ubuntu scosysv unixware dragonfly centos miros hurd raspberrypi" P_WORKING="minix freebsd solaris openbsd netbsd debian aix redhat hpux qnx tru64 openindiana suse solaris-x86 mandriva ubuntu scosysv unixware dragonfly centos miros hurd raspberrypi macosx hpux-ia64 syllable"
P="$P_WORKING" P="$P_WORKING"
POLAR=`parallel -k echo {}.polarhome.com ::: $P` POLAR=`parallel -k echo {}.polarhome.com ::: $P`

View file

@ -70,3 +70,12 @@ hurd.polarhome.com Works on hurd.polarhome.com
copy_and_test raspberrypi.polarhome.com copy_and_test raspberrypi.polarhome.com
raspberrypi.polarhome.com ### Run the test on raspberrypi.polarhome.com raspberrypi.polarhome.com ### Run the test on raspberrypi.polarhome.com
raspberrypi.polarhome.com Works on raspberrypi.polarhome.com raspberrypi.polarhome.com Works on raspberrypi.polarhome.com
copy_and_test macosx.polarhome.com
macosx.polarhome.com ### Run the test on macosx.polarhome.com
macosx.polarhome.com Works on macosx.polarhome.com
copy_and_test hpux-ia64.polarhome.com
hpux-ia64.polarhome.com ### Run the test on hpux-ia64.polarhome.com
hpux-ia64.polarhome.com Works on hpux-ia64.polarhome.com
copy_and_test syllable.polarhome.com
syllable.polarhome.com ### Run the test on syllable.polarhome.com
syllable.polarhome.com chmod: changing permissions of `bin/p.tmp': Function not implemented