Skip to content

Commit

Permalink
Update manifests for 2.8
Browse files Browse the repository at this point in the history 
Signed-off-by: Adrian Reber <areber@redhat.com>
  • Loading branch information
@adrianreber
adrianreber committed Apr 25, 2024
1 parent b186c03 commit 3877dd1
Show file tree
Hide file tree
Showing 91 changed files with 4,019 additions and 3,255 deletions.
59 changes: 28 additions & 31 deletions docs/recipes/install/common/build_tables.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sub usage {
print " -h --help generate help message and exit\n";
print " --category [name] update provided category table only\n";
print "\n";

exit(0);
}

Expand All @@ -31,7 +31,7 @@ sub usage {
if ( $ENV{'PWD'} =~ /\S+\/x86_64\// ) {
push @ohpcCategories, "lustre";
}


# skip older lmod defaults
push @exclude, "lmod-defaults-gnu-impi-ohpc";
Expand Down Expand Up @@ -147,7 +147,7 @@ sub write_table_header {
my @versionData = ();
my @urlData = ();
my @summaryData = ();

while(<IN>) {

# example format
Expand Down Expand Up @@ -177,7 +177,7 @@ sub write_table_header {
}

# Include period for summary

if( (substr $summary,-1) ne "." ) {
$summary = "$summary.";
}
Expand Down Expand Up @@ -239,17 +239,17 @@ sub write_table_header {

print " --> compiler_package = $compiler_package\n";
print " --> mpi_package = $mpi_package\n";

# latex entry

print $OUT "% <-- begin entry for $name_base\n";

if($compiler_package == 1 || $mpi_package == 1) {
my $end_index = $i;

# Find out how many packages in this family
for my $j ($i .. $#nameData) {
if( $compiler_package && $nameData[$j] =~ /$name_base-(\S+)-ohpc$/) {
if( $compiler_package && $nameData[$j] =~ /$name_base-(\S+)-ohpc$/) {
$end_index = $j;
} elsif ($mpi_package && $nameData[$j] =~ /$name_base-(\S+)-(\S+)-ohpc$/) {
$end_index = $j;
Expand All @@ -268,7 +268,7 @@ sub write_table_header {
### die "unexpected # of compiler families for $name_base" if ( $delta != $numCompiler_permute) ;
### }
### }
###
###
### if ($mpi_package) {
### if( exists $mpi_exceptions{$name_base} ) {
### die "unexpected # of mpi families for exception -> $name_base" if ($delta != $mpi_exceptions{$name_base});
Expand All @@ -278,7 +278,7 @@ sub write_table_header {
### }

# Check if all versions are equal, compiler/mpi variant additions
# might introduce asymmetry that needs to be handled
# might introduce asymmetry that needs to be handled

my $versions_equal=1;
my $startVer=$versionData[$i];
Expand Down Expand Up @@ -315,43 +315,43 @@ sub write_table_header {
if(! $versions_equal && ($k == $verIndex[0]) && (@verIndex > 1) ) {
print $OUT "\\cline{1-2} ";
}

print $OUT "$lname &";

if(! $versions_equal && ($k == $verIndex[0]) && (@verIndex > 1) ) {
my $local_delta = $verIndex[1] - $verIndex[0] + 1;
shift @verIndex;
print $OUT "\\multirow{$local_delta}{*}{$versionData[$k]}";
}
print $OUT "\n";


if($k == $i) {
my $sumLength = length($summaryData[$k]);
if($versions_equal) {
print $OUT "\\multirow{$delta}{*}{$versionData[$k]} & \n";
print $OUT "\\multirow{$delta}{*}{$versionData[$k]} &\n";
} else {
my $local_delta = $verIndex[0] - $i;
print $OUT "\\multirow{$local_delta}{*}{$versionData[$k]} & \n";
print $OUT "\\multirow{$local_delta}{*}{$versionData[$k]} &\n";
}
print $OUT "\\multirow{$delta}{\\linewidth}{$summaryData[$k] ";
if($sumLength <= $longSummaryLine || $delta > 2) {
print $OUT "\\newline";
}
print $OUT " {\\color{$urlColor} \\url{$urlData[$k]}}} \\\\ \n";
print $OUT " {\\color{$urlColor} \\url{$urlData[$k]}}}\\\\\n"
} else {
if($versions_equal) {
print $OUT "& \\\\ \n";
print $OUT "& \\\\\n";
} else {
print $OUT "& \\\\ ";
print $OUT "& \\\\";
print $OUT "\n";
}
}
}
print $OUT "\\hline\n";
# skip to next package
$i = $end_index+1;
print "skipping\n";
print "skipping\n";
print $OUT "% <-- end entry for $name_base\n\n";
next;
} else {
Expand All @@ -361,32 +361,29 @@ sub write_table_header {
my $lname = $name_base;
$lname =~ s/_/\\_/g;

print $OUT "\\multirow{2}{*}{$lname} & \n";
print $OUT "\\multirow{2}{*}{$versionData[$i]} & \n";

print $OUT "\\multirow{2}{*}{$lname} &\n";
print $OUT "\\multirow{2}{*}{$versionData[$i]} &\n";
if ($urlData[$i] ne "(none)") {
print $OUT "$summaryData[$i] ";
if($sumLength <= $longSummaryLine) {
print $OUT "\\newline";
}
print $OUT " { \\color{$urlColor} \\url{$urlData[$i]}} \n"
print $OUT " { \\color{$urlColor} \\url{$urlData[$i]}}\n"
} else {
print $OUT "\\multirow{2}{*}{$summaryData[$i]} \\\\\n";
print $OUT "\\multirow{2}{*}{$summaryData[$i]}\\\\\n";
print $OUT "& & \n";
}
print $OUT "\\\\ \\hline \n";

print $OUT "\\\\ \\hline\n";
print $OUT "% <-- end entry for $name_base\n\n";
}

$i++;
}
}

print $OUT "\\bottomrule\n";
print $OUT "\\end{tabularx}\n";
# print $OUT "\\end{tabular}\n";


close($OUT);
}


4 changes: 2 additions & 2 deletions docs/recipes/install/common/listchanges
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

#t_old="obs/OpenHPC_1.3.9_Factory"
t_old="v2.6.2.GA"
t_new="2.3"
t_old="v2.7.GA"
t_new="2.8"

f_all=pkg-ohpc.all
f_add=pkg-ohpc.chglog-add
Expand Down
12 changes: 6 additions & 6 deletions docs/recipes/install/common/listohpc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@ arch=""



echo $version | egrep -q "^1.0"
echo $version | grep -E -q "^1.0"
if [ $? -eq 0 ];then
pwd | grep -q centos7 && baseos="CentOS_7.1"
fi

echo $version | egrep -q "^1.2|^1.1"
echo $version | grep -E -q "^1.2|^1.1"
if [ $? -eq 0 ];then
pwd | grep -q sles12 && baseos="SLE_12_SP1"
pwd | grep -q centos7 && baseos="CentOS_7.2"
fi

echo $version | egrep -q "^1.3"
echo $version | grep -E -q "^1.3"
if [ $? -eq 0 ];then
pwd | grep -q sles12 && baseos="SLE_12"
pwd | grep -q centos7 && baseos="CentOS_7"
fi

echo $version | egrep -q "^2."
echo $version | grep -E -q "^2."
if [ $? -eq 0 ];then
pwd | grep -q leap15 && baseos="Leap_15"
pwd | grep -q centos8 && baseos="CentOS_8"
Expand Down Expand Up @@ -106,7 +106,7 @@ if [[ $minor_dig -eq 0 ]];then
--queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" | sort >> ${logfile}.all
else
dnf repoquery --archlist=${arch} --repofrompath="ohpc-base,${repobase}" --repoid=ohpc-base -a \
--queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" | egrep -v $skip | sort >> ${logfile}.all
--queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" | grep -E -v $skip | sort >> ${logfile}.all
fi

# query meta-packages
Expand All @@ -121,7 +121,7 @@ else
else
dnf repoquery --archlist=${arch} --repofrompath="ohpc-base,${repobase}" --repoid=ohpc-base -a --latest-limit 1 \
--repofrompath="ohpc-update,${repoupdate}" --repoid=ohpc-update \
--queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" | egrep -v $skip | sort >> ${logfile}.all
--queryformat='%{Name} %{Version} %{URL} %{Group} %{Summary}\n' | grep -e "-ohpc\b" | grep -E -v $skip | sort >> ${logfile}.all
fi

# query meta-packages
Expand Down
114 changes: 57 additions & 57 deletions docs/recipes/install/leap15/aarch64/warewulf/slurm/manifest/admin.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,108 +9,108 @@
\midrule

% <-- begin entry for conman-ohpc
\multirow{2}{*}{conman-ohpc} &
\multirow{2}{*}{0.3.0} &
ConMan: The Console Manager. \newline { \color{logoblue} \url{http://dun.github.io/conman}}
\\ \hline
\multirow{2}{*}{conman-ohpc} &
\multirow{2}{*}{0.3.0} &
ConMan: The Console Manager. \newline { \color{logoblue} \url{http://dun.github.io/conman}}
\\ \hline
% <-- end entry for conman-ohpc

% <-- begin entry for docs-ohpc
\multirow{2}{*}{docs-ohpc} &
\multirow{2}{*}{2.6.0} &
OpenHPC documentation. \newline { \color{logoblue} \url{https://github.com/openhpc/ohpc}}
\\ \hline
\multirow{2}{*}{docs-ohpc} &
\multirow{2}{*}{2.6.0} &
OpenHPC documentation. \newline { \color{logoblue} \url{https://github.com/openhpc/ohpc}}
\\ \hline
% <-- end entry for docs-ohpc

% <-- begin entry for examples-ohpc
\multirow{2}{*}{examples-ohpc} &
\multirow{2}{*}{2.0} &
Example source code and templates for use within OpenHPC environment. { \color{logoblue} \url{https://github.com/openhpc/ohpc}}
\\ \hline
\multirow{2}{*}{examples-ohpc} &
\multirow{2}{*}{2.0} &
Example source code and templates for use within OpenHPC environment. { \color{logoblue} \url{https://github.com/openhpc/ohpc}}
\\ \hline
% <-- end entry for examples-ohpc

% <-- begin entry for genders-ohpc
\multirow{2}{*}{genders-ohpc} &
\multirow{2}{*}{1.27} &
Static cluster configuration database. \newline { \color{logoblue} \url{https://github.com/chaos/genders}}
\\ \hline
\multirow{2}{*}{genders-ohpc} &
\multirow{2}{*}{1.27} &
Static cluster configuration database. \newline { \color{logoblue} \url{https://github.com/chaos/genders}}
\\ \hline
% <-- end entry for genders-ohpc

% <-- begin entry for lmod-defaults
lmod-defaults-arm1-mpich-ohpc &
\multirow{8}{*}{2.0} &
\multirow{8}{\linewidth}{OpenHPC default login environments. \newline {\color{logoblue} \url{https://github.com/openhpc/ohpc}}} \\
\multirow{8}{*}{2.0} &
\multirow{8}{\linewidth}{OpenHPC default login environments. \newline {\color{logoblue} \url{https://github.com/openhpc/ohpc}}}\\
lmod-defaults-arm1-openmpi4-ohpc &
& \\
& \\
lmod-defaults-gnu12-mpich-ofi-ohpc &
& \\
& \\
lmod-defaults-gnu12-mpich-ucx-ohpc &
& \\
& \\
lmod-defaults-gnu12-openmpi4-ohpc &
& \\
& \\
lmod-defaults-gnu9-mpich-ofi-ohpc &
& \\
& \\
lmod-defaults-gnu9-mpich-ucx-ohpc &
& \\
& \\
lmod-defaults-gnu9-openmpi4-ohpc &
& \\
& \\
\hline
% <-- end entry for lmod-defaults

% <-- begin entry for lmod-ohpc
\multirow{2}{*}{lmod-ohpc} &
\multirow{2}{*}{8.7.6} &
Lua based Modules (lmod). \newline { \color{logoblue} \url{https://github.com/TACC/Lmod}}
\\ \hline
\multirow{2}{*}{lmod-ohpc} &
\multirow{2}{*}{8.7.6} &
Lua based Modules (lmod). \newline { \color{logoblue} \url{https://github.com/TACC/Lmod}}
\\ \hline
% <-- end entry for lmod-ohpc

% <-- begin entry for losf-ohpc
\multirow{2}{*}{losf-ohpc} &
\multirow{2}{*}{0.56.0} &
A Linux operating system framework for managing HPC clusters. { \color{logoblue} \url{https://github.com/hpcsi/losf}}
\\ \hline
\multirow{2}{*}{losf-ohpc} &
\multirow{2}{*}{0.56.0} &
A Linux operating system framework for managing HPC clusters. { \color{logoblue} \url{https://github.com/hpcsi/losf}}
\\ \hline
% <-- end entry for losf-ohpc

% <-- begin entry for mrsh-ohpc
\multirow{2}{*}{mrsh-ohpc} &
\multirow{2}{*}{2.12} &
Remote shell program that uses munge authentication. \newline { \color{logoblue} \url{https://github.com/chaos/mrsh}}
\\ \hline
\multirow{2}{*}{mrsh-ohpc} &
\multirow{2}{*}{2.12} &
Remote shell program that uses munge authentication. \newline { \color{logoblue} \url{https://github.com/chaos/mrsh}}
\\ \hline
% <-- end entry for mrsh-ohpc

% <-- begin entry for nhc-ohpc
\multirow{2}{*}{nhc-ohpc} &
\multirow{2}{*}{1.4.2} &
LBNL Node Health Check. \newline { \color{logoblue} \url{https://github.com/mej/nhc}}
\\ \hline
\multirow{2}{*}{nhc-ohpc} &
\multirow{2}{*}{1.4.2} &
LBNL Node Health Check. \newline { \color{logoblue} \url{https://github.com/mej/nhc}}
\\ \hline
% <-- end entry for nhc-ohpc

% <-- begin entry for ohpc-release
\multirow{2}{*}{ohpc-release} &
\multirow{2}{*}{2} &
OpenHPC release files. \newline { \color{logoblue} \url{https://github.com/openhpc/ohpc}}
\\ \hline
\multirow{2}{*}{ohpc-release} &
\multirow{2}{*}{2} &
OpenHPC release files. \newline { \color{logoblue} \url{https://github.com/openhpc/ohpc}}
\\ \hline
% <-- end entry for ohpc-release

% <-- begin entry for pdsh-ohpc
\multirow{2}{*}{pdsh-ohpc} &
\multirow{2}{*}{2.34} &
Parallel remote shell program. \newline { \color{logoblue} \url{https://github.com/chaos/pdsh}}
\\ \hline
\multirow{2}{*}{pdsh-ohpc} &
\multirow{2}{*}{2.34} &
Parallel remote shell program. \newline { \color{logoblue} \url{https://github.com/chaos/pdsh}}
\\ \hline
% <-- end entry for pdsh-ohpc

% <-- begin entry for prun-ohpc
\multirow{2}{*}{prun-ohpc} &
\multirow{2}{*}{2.2} &
Convenience utility for parallel job launch. \newline { \color{logoblue} \url{https://github.com/openhpc/ohpc}}
\\ \hline
\multirow{2}{*}{prun-ohpc} &
\multirow{2}{*}{2.2} &
Convenience utility for parallel job launch. \newline { \color{logoblue} \url{https://github.com/openhpc/ohpc}}
\\ \hline
% <-- end entry for prun-ohpc

% <-- begin entry for test-suite-ohpc
\multirow{2}{*}{test-suite-ohpc} &
\multirow{2}{*}{2.6.0} &
Integration test suite for OpenHPC. \newline { \color{logoblue} \url{https://github.com/openhpc/ohpc/tests}}
\\ \hline
\multirow{2}{*}{test-suite-ohpc} &
\multirow{2}{*}{2.6.0} &
Integration test suite for OpenHPC. \newline { \color{logoblue} \url{https://github.com/openhpc/ohpc/tests}}
\\ \hline
% <-- end entry for test-suite-ohpc

\bottomrule
Expand Down
Loading

0 comments on commit 3877dd1

Please sign in to comment.