Skip to content

Commit

Permalink
Merge pull request #827 from danielpeter/devel
Browse files Browse the repository at this point in the history
updates hip flags and comments
  • Loading branch information
danielpeter committed Nov 13, 2023
2 parents 0800825 + 19314fc commit 0cdb66f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
8 changes: 4 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -8461,8 +8461,8 @@ then :

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: HIP PLATFORM NVIDIA detected." >&5
printf "%s\n" "$as_me: HIP PLATFORM NVIDIA detected." >&6;}
HIP_PLATFORM=nvcc
FLAG_PLATFORM="${FC_DEFINE}__HIP_PLATFORM_NVCC__"
HIP_PLATFORM=nvidia
FLAG_PLATFORM="${FC_DEFINE}__HIP_PLATFORM_NVIDIA__"

fi

Expand All @@ -8471,8 +8471,8 @@ then :

{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: HIP PLATFORM AMD detected." >&5
printf "%s\n" "$as_me: HIP PLATFORM AMD detected." >&6;}
HIP_PLATFORM=hcc
FLAG_PLATFORM="${FC_DEFINE}__HIP_PLATFORM_HCC__"
HIP_PLATFORM=amd
FLAG_PLATFORM="${FC_DEFINE}__HIP_PLATFORM_AMD__"

fi
# compiler might require a platform selection flag
Expand Down
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -529,14 +529,14 @@ AS_IF([test x"$want_hip" != xno], [
GPU_PLATFORM=`$HIPCONFIG_PROG --platform`
AS_IF([test x"$GPU_PLATFORM" = xnvidia], [
AC_MSG_NOTICE([HIP PLATFORM NVIDIA detected.])
HIP_PLATFORM=nvcc
FLAG_PLATFORM="${FC_DEFINE}__HIP_PLATFORM_NVCC__"
HIP_PLATFORM=nvidia
FLAG_PLATFORM="${FC_DEFINE}__HIP_PLATFORM_NVIDIA__"
])
AS_IF([test x"$GPU_PLATFORM" = xamd], [
AC_MSG_NOTICE([HIP PLATFORM AMD detected.])
HIP_PLATFORM=hcc
FLAG_PLATFORM="${FC_DEFINE}__HIP_PLATFORM_HCC__"
HIP_PLATFORM=amd
FLAG_PLATFORM="${FC_DEFINE}__HIP_PLATFORM_AMD__"
])
# compiler might require a platform selection flag
case "${HIP_FLAGS}" in
Expand Down
2 changes: 1 addition & 1 deletion src/meshfem3D/model_EMC.f90
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ module model_emc_par
! positive depth direction 1==up, 2==down
integer :: EMC_dep_dir = 0

! depth reference levle 1==earth surface, 2==sea level
! depth reference level 1==earth surface, 2==sea level
integer :: EMC_depth_reference_level = 0

! surface indices
Expand Down
7 changes: 6 additions & 1 deletion utils/Visualization/Blender/python_blender/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ The python script `blender_sphere.py` uses Blender's python module. To use the s
```
export BLENDER_SYSTEM_PYTHON='/opt/local/Library/Frameworks/Python.framework/Versions/3.10/'
```
For this to work, the python version must match the internal python version from Blender. In this example, Blender version 3.4.1 uses a python version 3.10.
For this to work, the python version must match the internal python version from Blender. In this example, Blender version 3.6 uses a python version 3.10.

Another option is to install matplotlib into the provided Blender python version. For example, on Mac this can be used:
```
/Applications/Blender.app/Contents/Resources/3.6/python/bin/python3.10 -m pip install matplotlib
```


## Simulation setup
Expand Down

0 comments on commit 0cdb66f

Please sign in to comment.