Remove Unix::Processors dependency

This commit is contained in:
Wilson Snyder 2020-12-23 16:07:14 -05:00
parent 575539996b
commit b8b9170f9d
5 changed files with 14 additions and 10 deletions

View File

@ -55,7 +55,7 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then
sudo apt-get install libsystemc libsystemc-dev
fi
if [ "$COVERAGE" = 1 ]; then
yes yes | sudo cpan -fi Unix::Processors Parallel::Forker
yes yes | sudo cpan -fi Parallel::Forker
fi
if [ "$M32" = 1 ]; then
sudo apt-get install gcc-multilib g++-multilib
@ -100,7 +100,7 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then
if [ "$CI_RUNS_ON" != "ubuntu-14.04" ]; then
CI_CPAN_REPO=https://cpan.org
fi
yes yes | sudo cpan -M $CI_CPAN_REPO -fi Unix::Processors Parallel::Forker
yes yes | sudo cpan -M $CI_CPAN_REPO -fi Parallel::Forker
install-vcddiff
autoconf

View File

@ -40,7 +40,7 @@ RUN apt-get update \
WORKDIR /tmp
RUN cpan install -fi Unix::Processors Parallel::Forker
RUN cpan install -fi Parallel::Forker
RUN git clone https://github.com/veripool/vcddiff.git && \
make -C vcddiff && \

View File

@ -100,7 +100,6 @@ Those developing Verilator itself may also want these (see internals.adoc):
sudo apt-get install gdb asciidoctor graphviz cmake clang clang-format gprof lcov
cpan install Pod::Perldoc
cpan install Unix::Processors
cpan install Parallel::Forker
==== Install SystemC

View File

@ -697,7 +697,7 @@ Verilator problem.
When enabling the long tests, some additional PERL modules are needed,
which you can install using cpan.
cpan install Unix::Processors
cpan install Parallel::Forker
There are some traps to avoid when running regression tests

View File

@ -249,12 +249,17 @@ sub parameter {
}
}
our $_Max_Procs;
sub max_procs {
my $ok = eval "
use Unix::Processors;
return Unix::Processors->new->max_online;
";
return $ok;
if (!defined $_Max_Procs) {
$_Max_Procs = `python3 -c 'import multiprocessing\nprint(multiprocessing.cpu_count())'`;
chomp $_Max_Procs;
if ($_Max_Procs < 2) {
$_Max_Procs = 2;
warn "driver.pl: Python didn't find at least two CPUs\n";
}
}
return $_Max_Procs;
}
sub calc_threads {