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.

Sign up for GitHub

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

set version to 0.5.0-rc1 #3196

Merged
merged 1 commit into from
May 12, 2020
Merged

set version to 0.5.0-rc1 #3196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
# The short X.Y version.
version = u'0.5.0'
# The full version, including alpha/beta/rc tags.
release = u'0.5.0.dev'
release = u'0.5.0-rc1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion include/picongpu/version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
#define PICONGPU_VERSION_MAJOR 0
#define PICONGPU_VERSION_MINOR 5
#define PICONGPU_VERSION_PATCH 0
#define PICONGPU_VERSION_LABEL "dev"
#define PICONGPU_VERSION_LABEL "rc1"
10 changes: 5 additions & 5 deletions share/picongpu/dockerfiles/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This exposes the ISAAC port to connect via the webclient to.
.. code:: bash

docker pull ax3l/picongpu
docker run --runtime=nvidia -p 2459:2459 -t ax3l/picongpu:0.5.0 lwfa_live
docker run --runtime=nvidia -p 2459:2459 -t ax3l/picongpu:0.5.0-rc1 lwfa_live
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ax3l repo is still used

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please tell me if you (e.g. @PrometheusPi and @psychocoderHPC ) create a dockerhub account.
I already reserved a picongpu/ org a while back and will then add you to it :)
https://hub.docker.com/orgs/picongpu

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Register now and increase the bus-factor by a three-fold."™

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ax3l I am now registered at docker.com as psychocoderhpc

# open firefox and isaac client

or
Expand Down Expand Up @@ -56,20 +56,20 @@ You can also push the result to dockerhub and singularity-hub (you need an accou
cd ubuntu-1604

# docker image
docker build -t ax3l/picongpu:0.5.0 .
docker build -t ax3l/picongpu:0.5.0-rc1 .
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ax3l repo su still used. Is this correct?

# optional: push to dockerhub (needed for singularity bootstrap)
docker login
docker push ax3l/picongpu:0.5.0
docker push ax3l/picongpu:0.5.0-rc1
# optional: mark as latest release
docker tag ax3l/picongpu:0.5.0 ax3l/picongpu:latest
docker tag ax3l/picongpu:0.5.0-rc1 ax3l/picongpu:latest
docker push ax3l/picongpu:latest

# singularity image
singularity create -s 4096 picongpu.img
sudo singularity bootstrap picongpu.img Singularity
# optional: push to a singularity registry
# setup your $HOME/.sregistry first
sregistry push picongpu.img --name ax3l/picongpu --tag 0.5.0
sregistry push picongpu.img --name ax3l/picongpu --tag 0.5.0-rc1

Recipes
-------
Expand Down
4 changes: 2 additions & 2 deletions share/picongpu/dockerfiles/ubuntu-1604/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM nvidia/cuda:9.2-base
MAINTAINER Axel Huebl <a.huebl@hzdr.de>
LABEL maintainer="Axel Huebl <a.huebl@hzdr.de>, Rene Widera <r.widera@hzdr.de>"

# docker and image environment
ENV DEBIAN_FRONTEND=noninteractive \
FORCE_UNSAFE_CONFIGURE=1 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Above: the MAINTAINER labels seams to be deprecated now in Docker. Just use:

LABEL maintainer="Rene Widera <r.widera@hzdr.de>, Axel Huebl <a.huebl@hzdr.de>"

SPACK_ROOT=/usr/local \
SPACK_EXTRA_REPO=/usr/local/share/spack-repo \
PIC_PACKAGE='picongpu@0.5.0+isaac backend=cuda'
PIC_PACKAGE='picongpu@0.5.0-rc1+isaac backend=cuda'
Copy link
Member

@ax3l ax3l Mar 5, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This tag here is the tag you provide in our spack repo.

So add this in its packages/picongpu/package.py before you can build.


# install minimal spack dependencies
# - adds gfortran for spack's openmpi package
Expand Down
6 changes: 3 additions & 3 deletions share/picongpu/dockerfiles/ubuntu-1604/Singularity
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Bootstrap: docker
From: ax3l/picongpu:0.5.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be pointing to anther repo not ax3l

From: ax3l/picongpu:0.5.0-rc1


%labels
Maintainer Axel Huebl <a.huebl@hzdr.de>
Version 0.5.0
Maintainer "Axel Huebl <a.huebl@hzdr.de>, Rene Widera <r.widera@hzdr.de>"
Version 0.5.0-rc1


%runscript
Expand Down