Skip to content

Commit 9e40ec0

Browse files
authored
Merge pull request qmlcode#99 from andersx/python2_bugs
Fixed error and warnings caused by latest numpy 1.16.0 and character error
2 parents f4a1514 + cd6e10a commit 9e40ec0

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

qml/fchl/fchl_kernel_functions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import scipy
3030
from scipy.special import binom
31-
from scipy.misc import factorial
31+
from scipy.special import factorial
3232

3333
def get_gaussian_parameters(tags):
3434

qml/qmlearn/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ def _remove_constant_features(self, representations):
345345
"""
346346

347347
if self._representation_type == 'atomic':
348-
# Due to how the atomic neural network constructed,
348+
# Due to how the atomic neural network is constructed,
349349
# this cannot be done elementwise
350350
rep = representations.reshape(-1, representations.shape[-1])
351351
if self._constant_features is None:

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
# UNCOMMENT TO FORCE LINKING TO MKL with GNU compilers:
2828
if mkl_exists(verbose=True):
29-
LINKER_FLAGS = ["-lgomp", " -lpthread", "-lm", "-ldl"]
29+
LINKER_FLAGS = ["-lgomp", "-lpthread", "-lm", "-ldl"]
3030
MATH_LINKER_FLAGS = ["-L${MKLROOT}/lib/intel64", "-lmkl_rt"]
3131

3232
# For clang without OpenMP: (i.e. most Apple/mac system)

test/test_fchl_scalar.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import scipy
3030
from scipy.special import jn
3131
from scipy.special import binom
32-
from scipy.misc import factorial
32+
from scipy.special import factorial
3333

3434
from qml.data import Compound
3535

0 commit comments

Comments
 (0)