From 11744367fa0a36be738226f14898ac5e8816491e Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Tue, 8 Jan 2019 17:02:26 +0000 Subject: added L member to Function --- Wrappers/Python/ccpi/optimisation/funcs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Wrappers/Python') diff --git a/Wrappers/Python/ccpi/optimisation/funcs.py b/Wrappers/Python/ccpi/optimisation/funcs.py index db00e9f..2266560 100755 --- a/Wrappers/Python/ccpi/optimisation/funcs.py +++ b/Wrappers/Python/ccpi/optimisation/funcs.py @@ -38,7 +38,7 @@ def isSizeCorrect(data1 ,data2): class Function(object): def __init__(self): - pass + self.L = None def __call__(self,x, out=None): raise NotImplementedError def grad(self, x): raise NotImplementedError def prox(self, x, tau): raise NotImplementedError -- cgit v1.2.3 From c324276a3fc2b0fec6c938691fb61c4b42442751 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Tue, 8 Jan 2019 17:06:55 +0000 Subject: Norm2sq does not fail if cannot calculate Lipschitz constant --- Wrappers/Python/ccpi/optimisation/funcs.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Wrappers/Python') diff --git a/Wrappers/Python/ccpi/optimisation/funcs.py b/Wrappers/Python/ccpi/optimisation/funcs.py index 2266560..c7a6143 100755 --- a/Wrappers/Python/ccpi/optimisation/funcs.py +++ b/Wrappers/Python/ccpi/optimisation/funcs.py @@ -136,6 +136,8 @@ class Norm2sq(Function): ''' def __init__(self,A,b,c=1.0,memopt=False): + super(Norm2sq, self).__init__() + self.A = A # Should be an operator, default identity self.b = b # Default zero DataSet? self.c = c # Default 1. @@ -146,11 +148,13 @@ class Norm2sq(Function): self.adjoint_placehold = A.allocate_adjoint() - # Compute the Lipschitz parameter from the operator. - # Initialise to None instead and only call when needed. - self.L = 2.0*self.c*(self.A.get_max_sing_val()**2) - super(Norm2sq, self).__init__() - + # Compute the Lipschitz parameter from the operator if possible + # Leave it initialised to None otherwise + try: + self.L = 2.0*self.c*(self.A.get_max_sing_val()**2) + except AttributeError as ae: + pass + def grad(self,x): #return 2*self.c*self.A.adjoint( self.A.direct(x) - self.b ) return (2.0*self.c)*self.A.adjoint( self.A.direct(x) - self.b ) -- cgit v1.2.3 From ba9994e131dae1e1c09f156df12327f2ef10beb4 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 11 Jan 2019 15:44:30 +0000 Subject: UPDATE: CIL VERSION needs to be set (#173) * UPDATE: CIL VERSION needs to be set * UPDATE: jenkins build and variants * UPDATE: channels conda-forge and ccpi --- Wrappers/Python/conda-recipe/bld.bat | 4 ++++ Wrappers/Python/conda-recipe/build.sh | 4 ++++ Wrappers/Python/conda-recipe/conda_build_config.yaml | 3 +++ Wrappers/Python/conda-recipe/meta.yaml | 10 +++++----- 4 files changed, 16 insertions(+), 5 deletions(-) (limited to 'Wrappers/Python') diff --git a/Wrappers/Python/conda-recipe/bld.bat b/Wrappers/Python/conda-recipe/bld.bat index d317f54..97a4e62 100644 --- a/Wrappers/Python/conda-recipe/bld.bat +++ b/Wrappers/Python/conda-recipe/bld.bat @@ -1,4 +1,8 @@ +IF NOT DEFINED CIL_VERSION ( +ECHO CIL_VERSION Not Defined. +exit 1 +) ROBOCOPY /E "%RECIPE_DIR%\.." "%SRC_DIR%" %PYTHON% setup.py build_py diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh index 2e68519..43e85d5 100644 --- a/Wrappers/Python/conda-recipe/build.sh +++ b/Wrappers/Python/conda-recipe/build.sh @@ -1,3 +1,7 @@ +if [ -z "$CIL_VERSION" ]; then + echo "Need to set CIL_VERSION" + exit 1 +fi mkdir ${SRC_DIR}/ccpi cp -r "${RECIPE_DIR}/../../../" ${SRC_DIR}/ccpi diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index 5dd08f5..b7977f3 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -2,3 +2,6 @@ python: - 2.7 # [not win] - 3.5 - 3.6 +numpy: + - 1.12 + - 1.15 diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 5de01c5..840590f 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -1,14 +1,13 @@ package: name: ccpi-framework - version: 0.11.3 + version: {{ environ['CIL_VERSION'] }} build: preserve_egg_dir: False -#script_env: -# - CIL_VERSION - number: 0 - + script_env: + - CIL_VERSION + #number: 0 test: requires: @@ -18,6 +17,7 @@ test: requirements: build: - python + - numpy {{ numpy }} - setuptools run: -- cgit v1.2.3