Merge pull request #35 from pyansys/cbellot/merge_0.3.0

Update version 0.3.0

Author: cbellot000

.ci/azure-pipelines.yml

@@ -27,75 +27,64 @@ jobs:
     DISPLAY: ':99.0'
     PYANSYS_OFF_SCREEN: True
     DPF_PORT: 32772
-    DPF_START_SERVER: False
   pool:
     vmImage: 'windows-2019'
 
-  steps:
-    - powershell: |
-        powershell .ci/install_opengl.ps1
-        .ci/setup_headless_display.sh
-        pip install -r .ci/requirements_test_xvfb.txt
-        python .ci/display_test.py
-      displayName: Install and start a virtual framebuffer
-
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: $(python.version)
-        addToPath: true
-
-    - task: PipAuthenticate@1
-      inputs:
-        artifactFeeds: 'pyansys'
-        onlyAddExtraIndex: true
-
-    - script: |
-        pip install -r requirements_build.txt
-        python setup.py bdist_wheel
-        pip install --find-links=dist ansys_dpf_core
-        cd tests
-        python -c "from ansys.dpf import core; print(core.Report(gpu=False))"
-      displayName: Install ansys-dpf-core
-
-    - task: UniversalPackages@0
+  steps:  
+    - template: templates\prepare-environment-windows.yml   
+        
+    - task: PublishBuildArtifacts@1
+      displayName: 'WHEEL: publish artifacts'
       inputs:
-        command: 'download'
-        downloadDirectory: '$(System.DefaultWorkingDirectory)'
-        feedsToUse: 'internal'
-        vstsFeed: '705e121a-9631-49f5-8aaf-c7142856f923'
-        vstsFeedPackage: 'f913c1d3-1fe4-404c-8c28-15a234e56803'
-        vstsPackageVersion: '21.1.4'
-
-    - script: |
-        @echo on
-        dir $(System.DefaultWorkingDirectory)
-        set THISDIR=$(System.DefaultWorkingDirectory)
-        set PATH=%THISDIR%\server\v211\tp\IntelMKL\2020.0.166\winx64\;%THISDIR%\server\v211\tp\hdf5\1.8.14\winx64\;%THISDIR%\server\v211\tp\CFFSDK\lib\winx64;%THISDIR%\res_files\;%PATH%
-        cd %THISDIR%\server\v211\aisol\bin\winx64
-        START /B Ans.Dpf.Grpc.exe --address 127.0.0.1 --port %DPF_PORT% > log.txt 2>&1
-        python -c "from ansys.dpf import core; core.connect_to_server(port=$(DPF_PORT)); print('Python Connected')"
-      displayName: Start DPF Server
+        PathtoPublish: '$(System.DefaultWorkingDirectory)\dist'
+        ArtifactName: 'ansys_dpf_core_wheel'
+      enabled: true
 
     - script: |
         pip install -r requirements_test.txt
-        cd tests
-        pytest -v --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml
+        set THISDIR=$(System.DefaultWorkingDirectory)
+        cd tests=$(System.DefaultWorkingDirectory)
+        set AWP_ROOT212=%THISDIR%\server\v212
+        pytest -v --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml --reruns 3
+        
       displayName: Test Core API
+      
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFormat: 'JUnit'
+        testResultsFiles: 'junit/test-results.xml' 
+        testRunTitle: 'windowsTests'
+        publishRunAttachments: true      
+      condition: always()
+      
+    - script: |
+        pip install twine
+        python setup.py sdist
+        twine upload --skip-existing dist/*
+      displayName: 'Upload to PyPi'
+      condition: contains(variables['Build.SourceBranch'], 'refs/tags/')
+      env:
+        TWINE_USERNAME: __token__
+        TWINE_PASSWORD: $(PYPI_TOKEN)
+        TWINE_REPOSITORY_URL: "https://upload.pypi.org/legacy/"      
+     
 
     - script: |
-        type $(System.DefaultWorkingDirectory)\server\v211\aisol\bin\winx64\log.txt
+        type $(System.DefaultWorkingDirectory)\server\v212\aisol\bin\winx64\log.txt
       displayName:  'Show DPF Server Logs'
-      condition: always()
+      condition: always() 
+    
+    - template: templates\kill-servers-windows.yml   
+      
 
 - job: Linux
   variables:
     python.version: '3.7'  # due to VTK 8.1.2 requirement for docbuild
     DISPLAY: ':99.0'
     PYANSYS_OFF_SCREEN: True
-    DPF_PORT: 32772
-    DPF_START_SERVER: False
-    DPF_IMAGE: docker.pkg.github.com/pyansys/dpf-core/dpf:v2021.1
-    DPF_DOCKER: True
+    DPF_PORT: 50055
+    TEMP: $(System.DefaultWorkingDirectory)/temp
+    
   pool:
     vmImage: 'ubuntu-20.04'
   steps:
@@ -118,34 +107,139 @@ jobs:
     - script: |
         pip install -r requirements_build.txt
         python setup.py bdist_wheel
-        pip install --find-links=dist ansys_dpf_core
+        export WHEELNAME=`ls dist/*.whl`
+        echo ${WHEELNAME}
+        pip install ${WHEELNAME}
         cd tests
         python -c "from ansys.dpf import core; print(core.Report())"
       displayName: Install ansys-dpf-core
 
+    - task: UniversalPackages@0
+      inputs:
+        command: 'download'
+        downloadDirectory: '$(System.DefaultWorkingDirectory)'
+        feedsToUse: 'internal'
+        vstsFeed: '705e121a-9631-49f5-8aaf-c7142856f923'
+        vstsFeedPackage: 'dpf-linux' #TODO: update hash of packages
+        vstsPackageVersion: '21.2.5'
+        
+    - script : |
+        echo $0
+        if pgrep -x "Ans.Dpf.Grpc" > /dev/null
+        then
+            pkill -f Ans.Dpf.Grpc.exe
+        fi
+      displayName: 'Kill all servers'
+      condition: always()
+      continueOnError: true
+      
     - script: |
-        set -ex
-        echo $(PAT) | docker login -u $(GH_USERNAME) --password-stdin docker.pkg.github.com
-        docker pull $(DPF_IMAGE)
-        docker run --restart always --name dpf -v `pwd`:/dpf -v /tmp:/dpf/_cache -p $(DPF_PORT):50054 $(DPF_IMAGE) > log.txt &
-        grep -q 'server started on ip' <(timeout 60 tail -f log.txt)
-        python -c "from ansys.dpf import core as dpf; dpf.connect_to_server(port=$(DPF_PORT)); print('Python Connected')"
-      displayName: Pull, launch, and validate DPF service
-
+        env
+      displayName: Display env
+      
+    - script: |
+        echo $0
+        export THISDIR=${SYSTEM_DEFAULTWORKINGDIRECTORY}
+        echo ${THISDIR}
+        export AWP_ROOT212=${THISDIR}/server/v212
+        cd ${THISDIR}/server/v212/aisol/bin/linx64
+        pwd
+        chmod 755 Ans.Dpf.Grpc.sh
+        chmod 755 Ans.Dpf.Grpc.exe        
+        ./Ans.Dpf.Grpc.sh --port 50054 & > log.txt
+        export DPF_IP=$(hostname -i)
+        python -c "from ansys.dpf import core; core.connect_to_server(ip= '${DPF_IP}', port=50054); print('Python Connected')"
+      displayName: Start DPF Server
+      
     - script: |
         pip install -r requirements_test.txt
-        pip install pytest-azurepipelines
+        pip install pytest-azurepipelines        
+        export AWP_ROOT212=${SYSTEM_DEFAULTWORKINGDIRECTORY}/server/v212
         cd tests
-        pytest -v --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml --cov-report=html
+        export DPF_IP=$(hostname -i)
+        pytest -v --junitxml=junit/test-results.xml --cov ansys.dpf.core --cov-report=xml  --reruns 3      
+        export PATH=`pwd`
+        echo ${PATH} 
       displayName: Test Core API
+      
+    - task: PublishTestResults@2
+      inputs:
+        testResultsFormat: 'JUnit'
+        testResultsFiles: 'junit/test-results.xml' 
+        testRunTitle: 'linuxTests'
+        publishRunAttachments: true
+        searchFolder: 'tests/'
+      condition: always()
+      
+      
+    - script : |
+        echo $0
+        if pgrep -x "Ans.Dpf.Grpc" > /dev/null
+        then
+            pkill -f Ans.Dpf.Grpc.exe
+        fi
+      displayName: 'Kill all servers'
+      condition: always()
+      continueOnError: true
 
+
+- job: DocumentationWindows
+  variables:
+    python.version: '3.8'
+    DISPLAY: ':99.0'
+    PYANSYS_OFF_SCREEN: True
+    DPF_PORT: 32772
+    GH_DOC_BRANCH: 'gh-pages'
+  pool:
+    vmImage: 'windows-2019'
+
+  steps:  
+    - template: templates\prepare-environment-windows.yml    
+   
     - script: |
-        pip install twine
-        python setup.py sdist
-        twine upload --skip-existing dist/*
-      displayName: 'Upload to PyPi'
+          pip install -r requirements_docs.txt
+          cd .ci
+          dir 
+          set THISDIR=$(System.DefaultWorkingDirectory)
+          set AWP_ROOT212=%THISDIR%\server\v212
+          ECHO %AWP_ROOT212%
+          build_doc.bat
+      displayName: Build Documentation
+        
+    - task: ArchiveFiles@2
+      inputs:
+        rootFolderOrFile: '$(System.DefaultWorkingDirectory)\docs\build' 
+        includeRootFolder: false 
+        archiveType: 'zip'
+        archiveFile: '$(System.DefaultWorkingDirectory)\docs\archive\doc-ansys-dpf-core.zip'
+        replaceExistingArchive: true 
+      displayName: 'DOCUMENTATION: zip artifacts'
+    
+    - task: PublishBuildArtifacts@1
+      displayName: 'DOCUMENTATION: publish artifacts'
+      inputs:
+        PathtoPublish: '$(System.DefaultWorkingDirectory)\docs\archive'
+        ArtifactName: doc-ansys-dpf-core
+      enabled: true      
+        
+    - powershell: |
+        git init
+        git checkout -b $(GH_DOC_BRANCH)
+        git config --global user.name "pyansys-ci-bot"
+        git config --global user.email "$(GH_EMAIL)"
+        New-Item -ItemType file .nojekyll
+        git add .
+        git commit -m "Documentation generated by $(Build.DefinitionName)"
+      displayName: "Init git and add docs"
+      workingDirectory: docs\build\html
+
+    - script: |
+        git remote add origin https://$(GH_PAT)@github.com/pyansys/DPF-Core-docs
+        git push -u origin $(GH_DOC_BRANCH) --force
+      displayName: "Publish GitHub Pages merge commit"
+      workingDirectory: docs\build\html
       condition: contains(variables['Build.SourceBranch'], 'refs/tags/')
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: $(PYPI_TOKEN)
-        TWINE_REPOSITORY_URL: "https://upload.pypi.org/legacy/"
+          
+    - template: templates\kill-servers-windows.yml    
+    
+      

.ci/build_doc.bat

@@ -0,0 +1,8 @@
+ECHO %AWP_ROOT212%
+set SPHINX_APIDOC_OPTIONS=inherited-members
+call sphinx-apidoc -o ../docs/source/api ../ansys ../ansys/dpf/core/aeneid.py -f --implicit-namespaces --separate  --no-headings
+pushd .
+cd ../docs/
+call make clean
+call make html
+popd

.ci/code_generation.py

@@ -0,0 +1,48 @@
+from ansys.dpf import core
+import os
+import glob
+from pathlib import Path
+import time
+import shutil
+
+if os.name == 'posix':
+    LIB_TO_GENERATE =["libAns.Dpf.Native.so",
+                      "libAns.Dpf.FEMutils.so",
+                      "libmapdlOperatorsCore.so",
+                      "libmeshOperatorsCore.so",
+                      "libAns.Dpf.Math.so",
+                      "libAns.Dpf.Hdf5.so"]
+else:
+    LIB_TO_GENERATE =["Ans.Dpf.Native.dll",
+                      "Ans.Dpf.FEMutils.dll",
+                      "meshOperatorsCore.dll",
+                      "mapdlOperatorsCore.dll",
+                      "Ans.Dpf.Math.dll",
+                      "Ans.Dpf.Hdf5.dll"]
+
+local_dir =os.path.dirname(os.path.abspath(__file__))
+TARGET_PATH = os.path.join(local_dir,os.pardir,"ansys", "dpf","core", "operators")
+files = glob.glob(os.path.join(TARGET_PATH, "*"))
+for f in files:
+    if Path(f).stem=="specification":
+        continue
+    try:
+        if os.path.isdir(f):
+            shutil.rmtree(f)
+        else:            
+            os.remove(f)
+    except:
+        pass
+core.start_local_server()
+code_gen = core.Operator("python_generator")
+code_gen.connect(1,TARGET_PATH)
+for lib in LIB_TO_GENERATE:
+    code_gen.connect(0, lib)
+    if lib != LIB_TO_GENERATE[0]:
+        code_gen.connect(2,False)
+    else:        
+        code_gen.connect(2,True)
+    code_gen.run()
+    time.sleep(0.1)
+
+core.SERVER.shutdown()

.ci/install_opengl.ps1

@@ -1 +1,2 @@
 pyvista>=0.27.2
+matplotlib==3.2