Merge branch 'develop'

.github/workflows/deploy_docs.yml

@@ -0,0 +1,77 @@
+name: deploy
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+      - gh_actions  # test branch
+      - '!gh-pages'
+    tags: '*'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Inject slug/short variables
+      uses: rlespinasse/[email protected]
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        path: main
+
+    - name: Checkout gh-pages
+      uses: actions/checkout@v2
+      with:
+        ref: gh-pages
+        path: gh-pages
+
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.8
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install sphinx
+
+    - name: Build
+      run: |
+        cd ${GITHUB_WORKSPACE}/main/
+        cmake -E make_directory build
+        cd build
+        cmake -DDocument=ON -DENABLE_MPI=OFF -DENABLE_SCALAPACK=OFF ../
+        make doc-ja-html doc-en-html tutorial-en-html
+
+    - name: Deploy Configuration
+      run: |
+          mkdir ~/.ssh
+          ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+          echo "${{ secrets.GH_ACTIONS_DEPLOY_KEY }}" > ~/.ssh/id_rsa
+          chmod 400 ~/.ssh/id_rsa
+
+    - name: Push
+      env:
+        GIT_USER: "HPhi Developers"
+        GIT_EMAIL: "[email protected]"
+        TARGET_NAME: ${{ env.GITHUB_REF_SLUG }}
+      run: |
+          cd ${GITHUB_WORKSPACE}
+          for lang in ja en tutorial/en; do
+            rm -rf "gh-pages/manual/${TARGET_NAME}/${lang}"
+            mkdir -p "gh-pages/manual/${TARGET_NAME}/${lang}"
+            cp -r "main/build/doc/${lang}/source/html" "gh-pages/manual/${TARGET_NAME}/${lang}"
+          done
+          cd gh-pages
+          git config --local user.name "${GIT_USER}"
+          git config --local user.email "${GIT_EMAIL}"
+          git remote set-url origin [email protected]:${GITHUB_REPOSITORY}.git
+          git add manual
+          if git commit -m "Deploy docs to ${TARGET_NAME} by GitHub Actions triggered by ${GITHUB_SHA}"
+          then
+            git push origin gh-pages
+          else
+            echo "Nothing to deploy"
+          fi

.github/workflows/main.yml

@@ -0,0 +1,63 @@
+name: CI
+
+on: [push]
+
+jobs:
+  ctest:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        mpisize: [1, 4, 16]
+        ompsize: [1, 3]
+        include:
+          - os: macos-10.15
+            mpisize: 1
+            ompsize: 1
+      fail-fast: false
+
+    env:
+      MPIRUN: "mpiexec --oversubscribe -np ${{ matrix.mpisize }}"
+      OMP_NUM_THREADS: ${{ matrix.ompsize }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: apt
+        if: ${{ runner.os == 'Linux' }}
+        run: |
+          sudo apt update
+          sudo apt install liblapack-dev openmpi-bin libopenmpi-dev libscalapack-openmpi-dev
+
+      - name: brew
+        if: ${{ runner.os == 'macOS' }}
+        run: |
+          brew install openmpi scalapack
+
+      - name: pip
+        run: |
+          python -m pip install numpy
+          python3 -m pip install numpy
+
+      - name: make workspace
+        run: cmake -E make_directory ${{runner.workspace}}/build
+
+      - name: cmake
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: |
+          if [ ${{ runner.os }} = "macOS" ] ; then
+            export FC=gfortran-11
+          fi
+          cmake -DCMAKE_VERBOSE_MAKEFILE=ON $GITHUB_WORKSPACE
+
+      - name: build
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: cmake --build ./ -j4
+
+      - name: ctest
+        working-directory: ${{runner.workspace}}/build
+        shell: bash
+        run: ctest -V

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/StdFace/submodule"]
-	path = src/StdFace/submodule
+[submodule "src/StdFace"]
+	path = src/StdFace
 	url = https://github.com/issp-center-dev/StdFace

CMakeLists.txt

@@ -29,14 +29,11 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_MACOSX_RPATH 1)
 
 if(NOT STDFACE_DIR)
+  set(STDFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace")
   # git submodule update
   # ref: https://cliutils.gitlab.io/modern-cmake/chapters/projects/submodule.html
   find_package(Git QUIET)
-  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/clone")
-    set(STDFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/clone")
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace")
-  elseif(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
-    set(STDFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/submodule")
+  if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
     # Update submodules as needed
     if(GIT_SUBMODULE_UPDATE)
       message(STATUS "Submodule update")
@@ -47,13 +44,9 @@ if(NOT STDFACE_DIR)
         message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
       endif()
     endif()
-  else()
-    set(STDFACE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/clone")
-    add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace")
   endif()
-
   if(NOT EXISTS "${STDFACE_DIR}/CMakeLists.txt")
-    message(FATAL_ERROR "Automatic download of the submodule StdFace failed! Please run 'sh ${CMAKE_CURRENT_SOURCE_DIR}/src/StdFace/download.sh' to download manually.")
+    message(FATAL_ERROR "StdFace is not found. Please `git clone` the repository (https://github.com/issp-center-dev/HPhi) or download an archive file (HPhi-X.Y.Z.tar.gz) from the release page (https://github.com/issp-center-dev/HPhi/releases)")
   endif()
 else()
   if(NOT EXISTS "${STDFACE_DIR}/CMakeLists.txt")

README.md

@@ -27,10 +27,12 @@ You can install HΦ and also get a manual for HΦ from a [release note](https://
 
 ## Licence
 
-The distribution of the program package and the source codes for HPhi follow GNU General Public License version 3 ([GPL v3](http://www.gnu.org/licenses/gpl-3.0.en.html)). 
+The distribution of the program package and the source codes for HPhi follow GNU General Public License version 3 ([GPL v3](http://www.gnu.org/licenses/gpl-3.0.en.html)).
 
 ## Official page
-[HPhi portal site](http://issp-center-dev.github.io/HPhi/index_en.html)
+- [HPhi portal site](https://www.pasums.issp.u-tokyo.ac.jp/hphi/en)
+- [User-Manual](https://www.pasums.issp.u-tokyo.ac.jp/hphi/en/doc/manual)
+- [HPhi tutorial](https://issp-center-dev.github.io/HPhi/manual/develop/tutorial/en/html/index.html)
 
 ## Author
-Youhei Yamaji, Takahiro Misawa, Synge Todo, Kota Ido, Kazuyoshi Yoshimi, Mitsuaki Kawamura, Naoki Kawashima.
+Youhei Yamaji, Takahiro Misawa, Synge Todo, Kota Ido, Yuichi Motoyama, Kazuyoshi Yoshimi, Mitsuaki Kawamura, Naoki Kawashima.

config/intel.cmake

@@ -6,7 +6,8 @@ set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -DNDEBUG -DHAVE_SSE2" CACHE STRING "" FORCE
 
 if(USE_SCALAPACK)
   if(SCALAPACK_LIBRARIES MATCHES "")
-    set(SCALAPACK_LIBRARIES "-L$ENV{MKLROOT}/lib/intel64 -lmkl_scalapack_lp64 -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_blacs_sgimpt_lp64")
+     set(SCALAPACK_LIBRARIES "-mkl=cluster")
+    #set(SCALAPACK_LIBRARIES "-L$ENV{MKLROOT}/lib/intel64 -lmkl_scalapack_lp64 -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_blacs_sgimpt_lp64")
   endif(SCALAPACK_LIBRARIES MATCHES "")
 
   message(STATUS "SCALAPACK_LIBRARIES is ${SCALAPACK_LIBRARIES}")