Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
openfpm_pdata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sbalzarini Lab
Software
Parallel Computing
OpenFPM
openfpm_pdata
Commits
b78ab073
Commit
b78ab073
authored
4 years ago
by
Abhinav Singh
Browse files
Options
Downloads
Plain Diff
Merge branch 'FD_solver' of git.mpi-cbg.de:openfpm/openfpm_pdata into FD_solver
parents
ff9949ad
bd17d597
No related branches found
No related tags found
No related merge requests found
Pipeline
#2299
failed
4 years ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.sh
+3
-2
3 additions, 2 deletions
build.sh
script/install_PETSC.sh
+1
-1
1 addition, 1 deletion
script/install_PETSC.sh
script/remove_old
+2
-2
2 additions, 2 deletions
script/remove_old
with
6 additions
and
5 deletions
build.sh
+
3
−
2
View file @
b78ab073
...
...
@@ -21,8 +21,9 @@ echo "Branch name: $branch"
echo
"GPU compilation:
$with_gpu
"
if
[
x
"
$hostname
"
==
x
"cifarm-centos-node"
]
;
then
if
[
x
"
$hostname
"
==
x
"cifarm-centos-node
.mpi-cbg.de
"
]
;
then
echo
"CentOS node"
source
/opt/rh/devtoolset-8/enable
fi
if
[
x
"
$hostname
"
==
x
"cifarm-ubuntu-node"
]
;
then
...
...
@@ -34,7 +35,7 @@ fi
if
[
x
"
$hostname
"
==
x
"cifarm-mac-node.mpi-cbg.de"
]
;
then
echo
"Mac node"
export
PATH
=
"/usr/local/bin:
$PATH
"
# rm -rf $HOME/openfpm_dependencies/openfpm_pdata/$branch/
# rm -rf $HOME/openfpm_dependencies/openfpm_pdata/$branch/
PETSC
fi
if
[
x
"
$hostname
"
==
x
"falcon1"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
script/install_PETSC.sh
+
1
−
1
View file @
b78ab073
...
...
@@ -169,7 +169,7 @@ if [ ! "$(ls -A $1/PETSC)" ]; then
rm
-rf
$1
/PETSC
else
#Mark the installation
echo
3
>
$1
/PETSC/version
echo
4
>
$1
/PETSC/version
exit
0
fi
This diff is collapsed.
Click to expand it.
script/remove_old
+
2
−
2
View file @
b78ab073
...
...
@@ -143,9 +143,9 @@ function remove_old()
if
[
-d
$1
/PETSC
]
;
then
version
=
$(
cat
$1
/PETSC/version
)
if
[
x
"
$version
"
!=
x
"
3
"
]
;
then
if
[
x
"
$version
"
!=
x
"
4
"
]
;
then
echo
-e
"
\0
33[1;34;5m --------------------------------------------------------------------------------------
\0
33[0m"
echo
-e
"
\0
33[1;34;5m PETSC has been updated to version 3.1
2
.3, the component will be updated automatically
\0
33[0m"
echo
-e
"
\0
33[1;34;5m PETSC has been updated to version 3.1
3
.3, the component will be updated automatically
\0
33[0m"
echo
-e
"
\0
33[1;34;5m --------------------------------------------------------------------------------------
\0
33[0m"
sleep
5
rm
-rf
$1
/PETSC
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment