Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

warpx v21.03 #11

Merged
merged 29 commits into from
Mar 5, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6f50b6c
updated v21.03
regro-cf-autotick-bot Mar 1, 2021
293ba60
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.9.0, and con…
regro-cf-autotick-bot Mar 1, 2021
378ec6b
Win: Remove Operator Work-Around
ax3l Mar 2, 2021
938ff18
Python Layer
ax3l Mar 2, 2021
812dc3e
Windows: Install Logic & Clean
ax3l Mar 2, 2021
3320736
Windows: CMake Clang Hints (.dll)
ax3l Mar 2, 2021
983dbb7
Win: more activation
ax3l Mar 3, 2021
25d519a
Switch clang, too
ax3l Mar 3, 2021
075c846
Update meta.yaml
isuruf Mar 3, 2021
a083ca3
Update meta.yaml
isuruf Mar 3, 2021
854c2f6
Update bld.bat
isuruf Mar 3, 2021
0b440fd
Win: Use MSVC-Like CLI for Clang
ax3l Mar 3, 2021
be3761d
Back to GNU-Like API, disable openPMD
ax3l Mar 3, 2021
99682d4
Try again clang-cl: empty flags
ax3l Mar 3, 2021
c7ee22c
Update bld.bat
isuruf Mar 3, 2021
2c240e4
CMake_AR/RANLIB: Forward slashes
ax3l Mar 3, 2021
6317406
CMAKE_AR/RANLIB: just exe name
ax3l Mar 3, 2021
8abdf56
CMAKE_AR/RANLIB: Forward / in paths
ax3l Mar 4, 2021
fbf2554
CMAKE_LINKER: try lld-link
ax3l Mar 4, 2021
56bf6ff
Windows: Fix Python Install
ax3l Mar 4, 2021
376e75d
Windows: try intel-openmp
ax3l Mar 4, 2021
e3baee0
Windows: keep llvm-openmp
ax3l Mar 4, 2021
04a8ced
Windows: enable openPMD again
ax3l Mar 4, 2021
7b74dbe
Enable FFT (PSATD): 2D & 3D
ax3l Mar 4, 2021
6330648
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.9.0, and con…
Mar 5, 2021
12cac76
openPMD: keep internal
ax3l Mar 5, 2021
aa143eb
Cleanup
ax3l Mar 5, 2021
f7347cc
Set CMAKE_NM
ax3l Mar 5, 2021
758ee5b
Windows: no FFTW/PSATD
ax3l Mar 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions .scripts/logging_utils.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 16 additions & 18 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 34 additions & 18 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
@echo on

echo "CXXFLAGS: %CXXFLAGS%"
set "CXXFLAGS=%CXXFLAGS% /FI%RECIPE_DIR%\myiso646.h"
echo "CXXFLAGS: %CXXFLAGS%"
set "NM=llvm-nm.exe"
set "LD=lld-link.exe"
set "AR=llvm-ar.exe"
set "RANLIB=llvm-ranlib.exe"
ax3l marked this conversation as resolved.
Show resolved Hide resolved

:: simple install prep
:: copy all warpx*.exe and warpx*.dll files
if not exist %LIBRARY_PREFIX%\bin md %LIBRARY_PREFIX%\bin
if errorlevel 1 exit 1

for %%d in (2 3 RZ) do (
cmake ^
Expand All @@ -10,11 +17,12 @@ for %%d in (2 3 RZ) do (
-DCMAKE_BUILD_TYPE=RelWithDebInfo ^
-DCMAKE_C_COMPILER=clang-cl ^
-DCMAKE_CXX_COMPILER=clang-cl ^
-DCMAKE_LINKER=%LD% ^
-DCMAKE_NM=%NM% ^
-DCMAKE_VERBOSE_MAKEFILE=ON ^
-DWarpX_amrex_branch=%PKG_VERSION% ^
-DWarpX_openpmd_internal=OFF ^
-DWarpX_picsar_branch=47c269eb242815f9382da61a110c0c8f12be2d08 ^
-DWarpX_ASCENT=OFF ^
-DWarpX_LIB=ON ^
-DWarpX_MPI=OFF ^
-DWarpX_OPENPMD=ON ^
-DWarpX_PSATD=OFF ^
Expand All @@ -25,18 +33,26 @@ for %%d in (2 3 RZ) do (

cmake --build build --config RelWithDebInfo --parallel 2
if errorlevel 1 exit 1
)

:: future: test

:: future: install
:: now: copy all warpx*.exe files
if not exist %LIBRARY_PREFIX%\bin md %LIBRARY_PREFIX%\bin
if errorlevel 1 exit 1

for /r "build\bin" %%f in (*.exe) do (
echo %%~nf
dir
copy build\bin\%%~nf.exe %LIBRARY_PREFIX%\bin\
if errorlevel 1 exit 1
for /r "build\bin" %%f in (*.exe) do (
echo %%~nf
dir
copy build\bin\%%~nf.exe %LIBRARY_PREFIX%\bin\
if errorlevel 1 exit 1
)
for /r "build\lib" %%f in (*.dll) do (
echo %%~nf
dir
copy build\lib\%%~nf.dll %LIBRARY_PREFIX%\lib\
if errorlevel 1 exit 1
)

rmdir /s /q build
)
:: future (if skipping AMReX headers) - inside above loop
:: cmake --build build --config RelWithDebInfo --target install
:: if errorlevel 1 exit 1

:: add Python API (PICMI interface)
PYWARPX_LIB_DIR=%LIBRARY_PREFIX%\lib python3 -m pip wheel .
python3 -m pip install pywarpx-*whl
16 changes: 11 additions & 5 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ do
-DCMAKE_CXX_STANDARD=${CXX_STANDARD} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DWarpX_amrex_branch=${PKG_VERSION} \
-DWarpX_openpmd_internal=OFF \
-DWarpX_picsar_branch=47c269eb242815f9382da61a110c0c8f12be2d08 \
-DWarpX_ASCENT=OFF \
-DWarpX_LIB=ON \
-DWarpX_OPENPMD=ON \
-DWarpX_PSATD=OFF \
-DWarpX_QED=ON \
Expand All @@ -37,10 +36,17 @@ do

# future:
#CTEST_OUTPUT_ON_FAILURE=1 make ${VERBOSE_CM} test

# future (if skipping AMReX headers)
#cmake --build build --target install
done

# future:
#make install
mkdir -p ${PREFIX}/bin
# simple install
# copy all binaries and libwarpx* files
mkdir -p ${PREFIX}/bin ${PREFIX}/lib
cp build/bin/warpx.* ${PREFIX}/bin/
cp build/lib/libwarpx.* ${PREFIX}/lib/

# add Python API (PICMI interface)
PYWARPX_LIB_DIR=$PREFIX/lib python3 -m pip wheel .
python3 -m pip install pywarpx-*whl
13 changes: 11 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% set name = "warpx" %}
{% set version = "21.02" %}
{% set version = "21.03" %}
{% set build = 0 %}
{% set sha256 = "735c92ef62a47ad1d6973eaf6bef36fd8c4fff920b896c04deb38440689be137" %}
{% set sha256 = "a8931e0dabf868e14b1e913b31ab7ff31164441a9f8a967c298512dd6230fe46" %}

package:
name: {{ name|lower }}
Expand Down Expand Up @@ -30,13 +30,22 @@ requirements:
- llvm-openmp # [osx or win]
host:
- boost-cpp
- mpi4py
- openmpi # [unix]
- openpmd-api * mpi_openmpi_* # [unix]
- openpmd-api # [win]
- pip
- setuptools
- wheel
# future
# - fftw * mpi_openmpi_* # [unix]
# - fftw # [win]
# a variant could provide CUDA support
run:
- numpy
- periodictable
- python
- scipy

test:
commands:
Expand Down
12 changes: 0 additions & 12 deletions recipe/myiso646.h

This file was deleted.