Page MenuHomeHEPForge
Files F7879751

No OneTemporary
Actions

View Options

diff --git a/pyext/professor2/__init__.py b/pyext/professor2/__init__.py
--- a/pyext/professor2/__init__.py
+++ b/pyext/professor2/__init__.py
@@ -1,58 +1,58 @@
import sys
pyversion = sys.version_info
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
raise Exception("Professor2 requires Python 2.7 or greater")
## Import Cython wrappings on the C++ core library
from professor2.core import *
__version__ = version()
from professor2.errors import *
from professor2.dataio import *
from professor2.histos import *
from professor2.ipolio import *
from professor2.ipol import *
from professor2.minimize import *
from professor2.paramsio import *
from professor2.params import *
from professor2.sampling import * #< the only module which requires NumPy
from professor2.weights import *
from professor2.chi2 import *
from professor2.eigentunes import *
def mk_timestamp():
"""
Time stamp, taken from http://stackoverflow.com/questions/13890935/timestamp-python
"""
import time
ts = time.time()
import datetime
st = datetime.datetime.fromtimestamp(ts).strftime('%Y-%m-%d %H:%M:%S')
return st
# def mk_versionstring():
# """
# Get version from setup.py, courtesy of
# http://stackoverflow.com/questions/2058802/how-can-i-get-the-version-defined-in-setup-py-setuptools-in-my-package
# """
# import pkg_resources # part of setuptools
# return pkg_resources.require("professor2")[0].version
# __version__ = mk_versionstring()
logo = \
"""
Visit us on http://professor.hepforge.org/
Please cite arXiv:0907.2973 [hep-ph]
%s
______ __ _____ _____
| ___ \ / _| |_ _|_ _|
| |_/ / __ ___ | |_ ___ ___ ___ ___ _ __ | | | |
| __/ '__/ _ \| _/ _ \/ __/ __|/ _ \| '__| | | | |
| | | | | (_) | || __/\__ \__ \ (_) | | _| |_ _| |_
|_| |_| \___/|_| \___||___/___/\___/|_| |_____|_____|
Andy Buckley, Holger Schulz v%s
- Copyright 2015-2018
+ Copyright 2015-2019
""" % (mk_timestamp(), version())
diff --git a/pyext/setup.py b/pyext/setup.py
--- a/pyext/setup.py
+++ b/pyext/setup.py
@@ -1,33 +1,31 @@
from distutils.core import setup
from distutils.extension import Extension
from glob import glob
-from Cython.Build import cythonize
-
import os
srcdir = os.environ["PWD"] #< assume makefile is called from base dir TODO: use cwd()?
libdir = os.path.abspath("lib") #< assume makefile is called from base dir TODO: use srcdir var?
incdir = os.path.abspath("include") #< assume makefile is called from base dir TODO: use srcdir var?
os.environ.setdefault("CC", "g++")
os.environ.setdefault("CXX", "g++")
ext = Extension("professor2.core",
["pyext/professor2/core.cpp"],
language="C++",
depends=glob("../include/*.h"),
include_dirs=[incdir, os.path.join(srcdir, "pyext", "professor2")],
- extra_compile_args="-std=c++11 -O3 -march=native -Wno-unused-but-set-variable -Wno-sign-compare".split(),
+ extra_compile_args="-std=c++11 -O3 -Wno-unused-but-set-variable -Wno-sign-compare".split(),
library_dirs=[libdir],
runtime_library_dirs=[],
libraries=["Professor2"])
v = os.environ.get("PROF_VERSION", "X.Y.Z")
setup(name = "professor2",
version=v,
- ext_modules = cythonize([ext]),
+ ext_modules = [ext],
packages = ["professor2", "professor2/ml", "professor2/misc"],
package_dir = {"": "pyext"},
description="Professor version 2",
author="Professor collaboration",
author_email="hschulz@fnal.gov",
- url="https://bitbucket.org/iamholger/professo")
+ url="https://bitbucket.org/iamholger/professor")

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 8:52 PM (1 d, 2 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3806171
Default Alt Text
(3 KB)

Event Timeline