Update setup-Linux-centos-8.sh

Dockerfile

@@ -0,0 +1,80 @@
+FROM centos:8
+# Install needed system tools
+RUN yum install git -y
+# RUN yum clean all
+# RUN yum groupinstall "Development Tools" -y
+# RUN yum install cmake -y 
+# RUN yum install ncurses-devel -y
+# RUN yum install epel-release -y
+# RUN yum install curl-devel -y
+# RUN yum install which -y
+# RUN yum install svn -y
+
+
+
+
+
+# RUN yum install 'dnf-command(config-manager)' -y
+
+# #RUN yum config-manager --set-enabled PowerTools # error
+# #RUN yum install armadillo-devel -y #error
+
+# # change directory
+# WORKDIR "/usr/local/src"
+# RUN yum install gcc openssl-devel bzip2-devel libffi-devel zlib-devel  xz-devel  -y
+
+# Install python 3.9.6
+# RUN curl https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tgz > Python-3.9.6.tgz
+# RUN tar xzf Python-3.9.6.tgz 
+# WORKDIR "/usr/local/src/Python-3.9.6"
+# RUN ./configure --prefix=/usr/local --enable-optimizations --with-system-ffi --with-computed-gotos --enable-loadable-sqlite-extensions CFLAGS="-fPIC"
+# RUN make -j 10
+# RUN make altinstall
+# RUN /sbin/ldconfig /usr/local/lib
+# RUN ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3
+# RUN ln -sf /usr/local/bin/python3.9-config /usr/local/bin/python3-config
+# RUN ln -sf /usr/local/bin/pydoc3.9 /usr/local/bin/pydoc
+# RUN ln -sf /usr/local/bin/idle3.9 /usr/local/bin/idle
+# RUN ln -sf /usr/local/bin/pip3.9 /usr/local/bin/pip3
+# RUN pip3 install --upgrade pip
+
+# RUN /usr/local/bin/python3 -m pip install matplotlib Pillow pandas numpy networkx pytz pysolar PyGithub scikit-learn xlrd boto3
+# RUN /usr/local/bin/python3 -m pip install IPython censusdata
+# # mac m1
+# # RUN /usr/local/bin/python3 -m pip install shapely 
+# WORKDIR /usr/local/src
+# RUN rm -f Python-3.9.6.tgz
+
+# RUN export PYTHONPATH="."
+# RUN export PATH=/usr/local/bin:$PATH
+# RUN export MAKEFLAGS=-j20
+# RUN export PYTHONSETUPFLAGS="-j 20"
+# clone gridlabd 
+WORKDIR /usr/local/src
+RUN git clone https://github.com/slacgismo/gridlabd
+WORKDIR /usr/local/src/gridlabd
+RUN rm -rf ./build-aux/setup-Linux-centos-8.sh
+COPY ./build-aux/setup-Linux-centos-8.sh ./build-aux/setup-Linux-centos-8.sh
+COPY ./requirements.txt ./requirements.txt
+COPY ./gldcore/scripts/autotest/test_matrix.glm ./gldcore/scripts/autotest/test_matrix.glm
+RUN   chmod +rxw ./gldcore/scripts/autotest/test_matrix.glm
+COPY ./gldcore/scripts/autotest/test_matrix_linalg.glm ./gldcore/scripts/autotest/test_matrix_linalg.glm
+RUN   chmod +rxw ./gldcore/scripts/autotest/test_matrix_linalg.glm
+COPY ./gldcore/scripts/autotest/test_matrix_matlib.glm ./gldcore/scripts/autotest/test_matrix_matlib.glm
+RUN   chmod +rxw ./gldcore/scripts/autotest/test_matrix_matlib.glm
+COPY ./gldcore/scripts/autotest/test_matrix_matrix.glm ./gldcore/scripts/autotest/test_matrix_matrix.glm
+RUN   chmod +rxw ./gldcore/scripts/autotest/test_matrix_matrix.glm
+COPY ./gldcore/scripts/autotest/test_matrix_random.glm ./gldcore/scripts/autotest/test_matrix_random.glm
+RUN   chmod +rxw ./gldcore/scripts/autotest/test_matrix_random.glm
+RUN chmod +rxw ./requirements.txt
+RUN chmod +rxw ./build-aux/setup-Linux-centos-8.sh
+
+
+COPY ./install.sh ./install.sh
+
+# test install.sh
+# RUN ./install.sh -v -t --parallel
+
+# WORKDIR "/usr/local/src/gridlabd"
+# RUN autoreconf -isf && ./configure
+# RUN make -j6 system

build-aux/setup-Linux-centos-8.sh

@@ -1,46 +1,69 @@
 #!/bin/bash
 
-# Install needed system tools
-yum -q update -y ; 
-yum -q clean all
-yum -q groupinstall "Development Tools" -y
-yum -q install cmake -y 
-yum -q install ncurses-devel -y
-yum -q install epel-release -y
-yum -q install curl-devel -y
-yum -q install which -y
-yum -q install svn -y
+# chmod -R 775 /usr/local
+# chown -R root:adm /usr/local
+
+#Install needed system tools
+yum clean all
+yum groupinstall "Development Tools" -y
+yum install cmake -y 
+yum install ncurses-devel -y
+yum install epel-release -y
+yum install curl-devel -y
+yum install which -y
+yum install svn -y
+
+yum install 'dnf-command(config-manager)' -y
+
+
+
+
+# change directory
+# cd /usr/local/src
+yum install gcc openssl-devel bzip2-devel libffi-devel zlib-devel  xz-devel  -y
+
 
 # python3 support needed as of 4.2
-if [ ! -x /usr/local/bin/python3 -o $(/usr/local/bin/python3 --version) != "Python 3.9.0" ]; then
-	yum -q install openssl-devel bzip2-devel libffi-devel zlib-devel -y
+if [ ! -x /usr/local/bin/python3 -o "$(/usr/local/bin/python3 --version)" != "Python 3.9.6" ]; then
+	# echo "install python 3.9.6"	
+
 	cd /usr/local/src
-	curl https://www.python.org/ftp/python/3.9.0/Python-3.9.0.tgz | tar xz
-	cd Python-3.9.0
+	yum install gcc openssl-devel bzip2-devel libffi-devel zlib-devel  xz-devel  -y
+	curl https://www.python.org/ftp/python/3.9.6/Python-3.9.6.tgz | tar xz
+	cd Python-3.9.6
 	./configure --prefix=/usr/local --enable-optimizations --with-system-ffi --with-computed-gotos --enable-loadable-sqlite-extensions CFLAGS="-fPIC"
 	make -j $(nproc)
 	make altinstall
+
 	ln -sf /usr/local/bin/python3.9 /usr/local/bin/python3
 	ln -sf /usr/local/bin/python3.9-config /usr/local/bin/python3-config
 	ln -sf /usr/local/bin/pydoc3.9 /usr/local/bin/pydoc
 	ln -sf /usr/local/bin/idle3.9 /usr/local/bin/idle
 	ln -sf /usr/local/bin/pip3.9 /usr/local/bin/pip3
-	/usr/local/bin/python3 pip -m install mysql-connector matplotlib numpy pandas Pillow
+	# install python packages
+	/usr/local/bin/python3 -m pip install --upgrade pip
+	/usr/local/bin/python3 -m pip install matplotlib Pillow pandas numpy networkx pytz pysolar PyGithub scikit-learn xlrd 
+	/usr/local/bin/python3 -m pip install IPython censusdata
+
+
 fi
 
 # latex
 if [ ! -x /usr/bin/tex ]; then
 	yum -q install tex -y
 fi
 
-# doxygen
+# # doxygen
+
 if [ ! -x /usr/bin/doxygen ]; then
+	echo "install doxygen"
 	if [ ! -d /usr/local/src/doxygen ]; then
 		git clone https://github.com/doxygen/doxygen.git /usr/local/src/doxygen --depth 1
 	fi
 	if [ ! -d /usr/local/src/doxygen/build ]; then
 		mkdir /usr/local/src/doxygen/build
 	fi
+
 	cd /usr/local/src/doxygen/build
 	cmake -G "Unix Makefiles" ..
 	make
@@ -49,13 +72,15 @@ fi
 
 # mono
 if [ ! -f /usr/bin/mono ]; then
-	rpmkeys --import "http://pool.sks-keyservers.net/pks/lookup?op=get&search=0x3fa7e0328081bff6a14da29aa6a19b38d3d831ef"
-	curl -s https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo
+
+	rpmkeys --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
+	su -c 'curl https://download.mono-project.com/repo/centos8-stable.repo | tee /etc/yum.repos.d/mono-centos8-stable.repo'
 	yum -q install mono-devel -y
 fi
 
-# natural_docs
+# # # natural_docs
 if [ ! -x /usr/local/bin/natural_docs ]; then
+
 	cd /usr/local
 	curl -s https://www.naturaldocs.org/download/natural_docs/2.0.2/Natural_Docs_2.0.2.zip > natural_docs.zip
 	unzip -qq natural_docs

gldcore/scripts/autotest/test_matrix.glm

@@ -1,5 +1,5 @@
 // check numpy version (must be exactly the same to pass these tests)
-#assert $(gridlabd matrix version) == '1.21.4'
+#assert $(gridlabd matrix version) == '1.22.0'
 
 // matrix operations test
 #assert $(gridlabd matrix -f copy "1,2;3,4") == '1,2;3,4'

gldcore/scripts/autotest/test_matrix_linalg.glm

@@ -1,5 +1,5 @@
 // check numpy version (must be exactly the same to pass these tests)
-#assert $(gridlabd matrix version) == '1.21.4'
+#assert $(gridlabd matrix version) == '1.22.0'
 
 // linalg.cholesky <matrix>
 #assert $(gridlabd matrix -f linalg.cholesky "1,2;-2,5") == '1,0;-2,1'

gldcore/scripts/autotest/test_matrix_matlib.glm

@@ -1,4 +1,4 @@
-#assert $(gridlabd matrix version) == '1.21.4'
+#assert $(gridlabd matrix version) == '1.22.0'
 
 // matlib.rand <intlist_args>
 #assert ! -z "$(gridlabd matrix -f matlib.rand 1)"

gldcore/scripts/autotest/test_matrix_matrix.glm

@@ -1,4 +1,4 @@
-#assert $(gridlabd matrix version) == '1.21.4'
+#assert $(gridlabd matrix version) == '1.22.0'
 
 // matrix.all <matrix> axis=<int>
 #assert $(gridlabd matrix -f matrix.all "1,2,3;4,5,6;") == '1'

gldcore/scripts/autotest/test_matrix_random.glm

@@ -1,4 +1,4 @@
-#assert $(gridlabd matrix version) == '1.21.4'
+#assert $(gridlabd matrix version) == '1.22.0'
 
 // random.choice <arrayorint> size=<intlist> replace=<boolstr> p=<array>
 #assert ! -z $(gridlabd matrix -f random.choice "1,2,3,4,5")

install.sh

@@ -315,6 +315,7 @@ if [ ! -f "configure" -o "$QUICK" == "no" ]; then
 fi
 
 NPROC=1
+SYSTEM=$(uname -s)
 if [ "$PARALLEL" == "yes" ]; then
 	if [ "$SYSTEM" == "Linux" ]; then
 		NPROC=$(lscpu | grep '^CPU(s):' | cut -f2- -d' ')
@@ -325,8 +326,9 @@ fi
 
 # build everything
 export PATH=/usr/local/bin:/usr/bin:/bin
-run make -j$((3*$NPROC))
-run make install
+run make -j$((3*$NPROC)) system
+# run make install
+
 if [ "$DOCS" == "yes" ]; then
 	run make html 
 	run cp -r "documents/html" "$INSTALL"

requirements.txt

@@ -1,5 +1,5 @@
 matplotlib==3.3.3
-numpy==1.21.4
+numpy>=1.21.4
 pytz==2020.4
 PyGithub==1.54.1
 docker==4.4.4