diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81ff6e9db533cd4e42757db93d167922503501b7..1e7dde5eef8e43525184bb4443b3b3fd07770bd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,47 +1,6 @@ -stages: - - build - - test - - release - -variables: - CONTAINER_TEST_IMAGE: boileaum/rosen:$CI_COMMIT_REF_NAME - CONTAINER_RELEASE_IMAGE: boileaum/rosen:latest - -before_script: - - echo $DOCKERHUB_PASSWD | docker login -u boileaum --password-stdin - -b:docker: - stage: build - tags: - - shell, docker - script: - - docker build --pull -t $CONTAINER_TEST_IMAGE -f ./docker/Dockerfile-rosen . - - docker push $CONTAINER_TEST_IMAGE - -t:helloworld: - stage: test - tags: - - shell, docker - script: - - docker pull $CONTAINER_TEST_IMAGE - - docker run $CONTAINER_TEST_IMAGE /bin/bash -c 'python test_helloworld.py' - -t:rosen: - stage: test - tags: - - shell, docker - script: - - docker pull $CONTAINER_TEST_IMAGE - - docker run $CONTAINER_TEST_IMAGE /bin/bash -c 'pytest -v' - -r:docker: - stage: release +helloworld: tags: - shell, docker script: - - docker pull $CONTAINER_TEST_IMAGE - - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE - - docker push $CONTAINER_RELEASE_IMAGE - only: - - master + - echo "hello, world" diff --git a/docker/Dockerfile-pythran b/docker/Dockerfile-pythran deleted file mode 100644 index 136d8bdc1a2cd4f074bc0394d9233cd96c069d0e..0000000000000000000000000000000000000000 --- a/docker/Dockerfile-pythran +++ /dev/null @@ -1,21 +0,0 @@ -FROM python:3 -MAINTAINER Matthieu Boileau <matthieu.boileau@math.unistra.fr> - -COPY requirements.txt ./ -RUN pip install --no-cache-dir -r requirements.txt - -RUN apt-get update --fix-missing && \ - apt-get install -y \ - vim - -RUN apt-get clean && \ -rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN useradd -m -s /bin/bash euler -ENV HOME /home/euler -RUN chown -R euler:euler /home/euler -USER euler -WORKDIR $HOME - -CMD /bin/bash - diff --git a/docker/Dockerfile-rosen b/docker/Dockerfile-rosen deleted file mode 100644 index 160abec68e4077775a85012d9805dfe74d595931..0000000000000000000000000000000000000000 --- a/docker/Dockerfile-rosen +++ /dev/null @@ -1,14 +0,0 @@ -FROM boileaum/pythran:latest -MAINTAINER Matthieu Boileau <matthieu.boileau@math.unistra.fr> - -ENV HOME /home/euler -ADD . $HOME/rosen -USER root -RUN chown -R euler:euler /home/euler -WORKDIR $HOME/rosen -USER euler - -RUN make clean && make - -CMD /bin/bash - diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml deleted file mode 100644 index 21e8d04051b45814e607fe85b075d127c45441d5..0000000000000000000000000000000000000000 --- a/docker/docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '2' - -services: - env: - build: - context: ../ - dockerfile: docker/Dockerfile-pythran - image: boileaum/pythran:latest - - user: - build: - context: ../ - dockerfile: docker/Dockerfile-rosen - image: boileaum/rosen:latest - depends_on: - - env - diff --git a/helloworld.c b/helloworld.c deleted file mode 100644 index 9ddb72cb07c4babbe075b3d5bdd5485f73bb7861..0000000000000000000000000000000000000000 --- a/helloworld.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <stdio.h> - -int main(void) -{ - printf("hello, world\n"); - return 0; -} diff --git a/makefile b/makefile deleted file mode 100644 index d55875ea9c49e3f221b4b1cf0e052aac21420c95..0000000000000000000000000000000000000000 --- a/makefile +++ /dev/null @@ -1,13 +0,0 @@ -.PHONY: clean pythran - -all: C pythran - -C: - gcc helloworld.c -o helloworld.e - -pythran: - pythran rosenbrock.py -o rosenbrock_pythran.so - -clean: - rm -rf *.o *.e *.so *.pyf *.pyc __pycache__ - diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index a8aa58a199017da735c5108e1d7e343eac0a523e..0000000000000000000000000000000000000000 --- a/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -colorlog -numpy -pytest -pythran diff --git a/rosenbrock.py b/rosenbrock.py deleted file mode 100644 index e3ea0a1e507ea949e70392812c58bde4b5bf81c4..0000000000000000000000000000000000000000 --- a/rosenbrock.py +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8 -*- -#runas import numpy as np; r = np.arange(0.,10., .01); rosen(r) -#bench import numpy as np; r = np.arange(50000000); rosen(r) -#pythran export rosen(int[]) -#pythran export rosen(float[]) - -import numpy as np - - -def rosen(x): - t0 = 100 * (x[1:] - x[:-1] ** 2) ** 2 - t1 = (1 - x[:-1]) ** 2 - return np.sum(t0 + t1) diff --git a/run_docker.sh b/run_docker.sh deleted file mode 100755 index d96c56eb0a12c5393f30765506f9a182c4c25bf7..0000000000000000000000000000000000000000 --- a/run_docker.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -docker run -ti --rm -v $(pwd):/home/euler boileaum/pythran:latest diff --git a/test_helloworld.py b/test_helloworld.py deleted file mode 100644 index 7e6deb4e2f145112fceba9037469141e9454f938..0000000000000000000000000000000000000000 --- a/test_helloworld.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -""" -Test helloworld.c -""" - -import os -assert os.popen('./helloworld.e', 'r').read() == "hello, world\n" diff --git a/test_rosenbrock.py b/test_rosenbrock.py deleted file mode 100644 index 7d52b6a0140dad55910f8f5a8ffa64f682ca4db2..0000000000000000000000000000000000000000 --- a/test_rosenbrock.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -""" -Test Rosenbrock -""" - -from rosenbrock_pythran import rosen as rosen_pythran -from rosenbrock import rosen as rosen_python -from pytest import mark, approx -import numpy as np - - -r_float = np.arange(0., 10., .01) -expect_float = 152089858.36719903 - -r_int = np.arange(50000000) -expect_int = 7842832767944603480 - -param = [(r_float, expect_float), (r_int, expect_int)] - - -@mark.parametrize('r, result', param) -def test_rosen_python(r, result): - assert rosen_python(r) == approx(result) - - -@mark.parametrize('r, result', param) -def test_rosen_pythran(r, result): - assert rosen_pythran(r) == approx(result)