Skip to content

Commit 2160d34

Browse files
mbrobbelmbrobbel
authored
Merge pull request #252 from mbrobbel/release-0.0.13
Release 0.0.13
2 parents 60cb181 + 938d682 commit 2160d34

5 files changed

Lines changed: 44 additions & 47 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎codegen/cpp/fletchgen/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

3-
project(fletchgen VERSION 0.0.12 LANGUAGES CXX)
3+
project(fletchgen VERSION 0.0.13 LANGUAGES CXX)
44

55
find_package(Arrow 1.0 CONFIG REQUIRED)
66

@@ -21,7 +21,7 @@ FetchContent_MakeAvailable(cmake-modules)
2121

2222
FetchContent_Declare(cerata
2323
GIT_REPOSITORY https://github.com/abs-tudelft/cerata.git
24-
GIT_TAG develop
24+
GIT_TAG 0.0.11
2525
)
2626
FetchContent_GetProperties(cerata)
2727
if(NOT cerata_POPULATED)

‎codegen/python/setup.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@
2121
from distutils.command.clean import clean as _clean
2222
from distutils.command.sdist import sdist as _sdist
2323

24-
import os, platform, shutil
24+
import os
25+
import platform
26+
import shutil
2527
import numpy as np
2628
import pyarrow as pa
2729

30+
2831
def read(fname):
2932
with open(os.path.join(os.path.dirname(__file__), fname)) as f:
3033
return f.read()
3134

35+
3236
target_dir = os.getcwd() + "/build"
3337
output_dir = target_dir + "/install"
3438
include_dir = output_dir + "/include"
@@ -38,15 +42,18 @@ def read(fname):
3842
py_build_dir = py_target_dir + "/build"
3943
py_dist_dir = target_dir + "/dist"
4044

45+
4146
class clean(_clean):
4247
def run(self):
4348
_clean.run(self)
4449
try:
45-
[os.remove('pyfletchgen/lib' + x) for x in ['.cpp', '.h', '_api.h']]
50+
[os.remove('pyfletchgen/lib' + x)
51+
for x in ['.cpp', '.h', '_api.h']]
4652
except:
4753
pass
4854
shutil.rmtree(target_dir)
4955

56+
5057
class build(_build):
5158
def initialize_options(self):
5259
_build.initialize_options(self)
@@ -63,37 +70,38 @@ def run(self):
6370
except ImportError:
6471
# TODO: download cmake 3.14 and extract in build dir
6572
raise ImportError('CMake or make not found')
66-
cmake['../../cpp/fletchgen']\
67-
['-DBUILD_FLETCHGEN_LIB=On']\
68-
['-DBUILD_FLETCHGEN=Off']\
69-
['-DCMAKE_BUILD_TYPE=Release']\
70-
['-DCMAKE_INSTALL_PREFIX={}'.format(output_dir)] & FG
73+
cmake['../../cpp/fletchgen']['-DBUILD_FLETCHGEN_LIB=On']['-DBUILD_FLETCHGEN=Off'][
74+
'-DCMAKE_BUILD_TYPE=Release']['-DCMAKE_INSTALL_PREFIX={}'.format(output_dir)] & FG
7175
make['-j4'] & FG
7276
make['install'] & FG
7377
_build.run(self)
7478

79+
7580
class bdist(_bdist):
7681
def finalize_options(self):
7782
_bdist.finalize_options(self)
7883
self.dist_dir = py_dist_dir
7984

85+
8086
class sdist(_sdist):
8187
def finalize_options(self):
8288
_sdist.finalize_options(self)
8389
self.dist_dir = py_dist_dir
8490

91+
8592
class egg_info(_egg_info):
8693
def initialize_options(self):
8794
_egg_info.initialize_options(self)
8895
self.egg_base = py_target_dir
8996

97+
9098
setup(
9199
name="pyfletchgen",
92-
version="0.0.12",
100+
version="0.0.13",
93101
author="Accelerated Big Data Systems, Delft University of Technology",
94102
packages=find_packages(),
95103
url="https://github.com/abs-tudelft/fletcher",
96-
project_urls = {
104+
project_urls={
97105
"Bug Tracker": "https://github.com/abs-tudelft/fletcher/issues",
98106
"Documentation": "https://abs-tudelft.github.io/fletcher/",
99107
"Source Code": "https://github.com/abs-tudelft/fletcher/",
@@ -115,7 +123,7 @@ def initialize_options(self):
115123
extra_link_args=["-std=c++11"]
116124
)
117125
],
118-
entry_points = {'console_scripts': ['fletchgen=pyfletchgen:_run']},
126+
entry_points={'console_scripts': ['fletchgen=pyfletchgen:_run']},
119127
install_requires=[
120128
'numpy >= 1.14',
121129
'pandas',
@@ -134,13 +142,13 @@ def initialize_options(self):
134142
"License :: OSI Approved :: Apache Software License",
135143
"Operating System :: POSIX :: Linux"
136144
],
137-
cmdclass = {
145+
cmdclass={
138146
'bdist': bdist,
139147
'build': build,
140148
'clean': clean,
141149
'egg_info': egg_info,
142150
'sdist': sdist,
143151
},
144152
license='Apache License, Version 2.0',
145-
zip_safe = False,
153+
zip_safe=False,
146154
)

‎runtime/cpp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

3-
project(fletcher VERSION 0.0.12 LANGUAGES CXX)
3+
project(fletcher VERSION 0.0.13 LANGUAGES CXX)
44

55
find_package(Arrow 1.0 CONFIG REQUIRED)
66

‎runtime/python/setup.py‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,19 @@
2121
from distutils.command.clean import clean as _clean
2222
from distutils.command.sdist import sdist as _sdist
2323

24-
import os, platform, shutil, glob
24+
import os
25+
import platform
26+
import shutil
27+
import glob
2528
import numpy as np
2629
import pyarrow as pa
2730

31+
2832
def read(fname):
2933
with open(os.path.join(os.path.dirname(__file__), fname)) as f:
3034
return f.read()
3135

36+
3237
target_dir = os.getcwd() + "/build"
3338
output_dir = target_dir + "/install"
3439
include_dir = output_dir + "/include"
@@ -38,6 +43,7 @@ def read(fname):
3843
py_build_dir = py_target_dir + "/build"
3944
py_dist_dir = target_dir + "/dist"
4045

46+
4147
class clean(_clean):
4248
def run(self):
4349
_clean.run(self)
@@ -47,6 +53,7 @@ def run(self):
4753
pass
4854
shutil.rmtree(target_dir)
4955

56+
5057
class build(_build):
5158
def initialize_options(self):
5259
_build.initialize_options(self)
@@ -63,40 +70,41 @@ def run(self):
6370
except ImportError:
6471
# TODO: download cmake 3.14 and extract in build dir
6572
raise ImportError('CMake or make not found')
66-
cmake['../../..']\
67-
['-DFLETCHER_BUILD_ECHO=ON']\
68-
['-DCMAKE_BUILD_TYPE=Release']\
69-
['-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0']\
70-
['-DCMAKE_INSTALL_PREFIX={}'.format(output_dir)] & FG
73+
cmake['../../..']['-DFLETCHER_BUILD_ECHO=ON']['-DCMAKE_BUILD_TYPE=Release'][
74+
'-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0']['-DCMAKE_INSTALL_PREFIX={}'.format(output_dir)] & FG
7175
make['-j4'] & FG
7276
make['install'] & FG
7377
_build.run(self)
7478

79+
7580
class bdist(_bdist):
7681
def finalize_options(self):
7782
_bdist.finalize_options(self)
7883
self.dist_dir = py_dist_dir
7984

85+
8086
class sdist(_sdist):
8187
def finalize_options(self):
8288
_sdist.finalize_options(self)
8389
self.dist_dir = py_dist_dir
8490

91+
8592
class egg_info(_egg_info):
8693
def initialize_options(self):
8794
_egg_info.initialize_options(self)
8895
self.egg_base = os.path.relpath(py_target_dir)
8996

97+
9098
setup(
9199
name="pyfletcher",
92-
version="0.0.12",
100+
version="0.0.13",
93101
author="Accelerated Big Data Systems, Delft University of Technology",
94102
packages=find_packages(),
95103
description="A Python wrapper for the Fletcher runtime library",
96104
long_description=read('README.md'),
97105
long_description_content_type='text/markdown',
98106
url="https://github.com/abs-tudelft/fletcher",
99-
project_urls = {
107+
project_urls={
100108
"Bug Tracker": "https://github.com/abs-tudelft/fletcher/issues",
101109
"Documentation": "https://abs-tudelft.github.io/fletcher/",
102110
"Source Code": "https://github.com/abs-tudelft/fletcher/",
@@ -143,16 +151,17 @@ def initialize_options(self):
143151
"License :: OSI Approved :: Apache Software License",
144152
"Operating System :: POSIX :: Linux"
145153
],
146-
cmdclass = {
154+
cmdclass={
147155
'bdist': bdist,
148156
'build': build,
149157
'clean': clean,
150158
'egg_info': egg_info,
151159
'sdist': sdist,
152160
},
153161
license='Apache License, Version 2.0',
154-
zip_safe = False,
155-
data_files= [
156-
('lib', [output_dir + '/lib64/libfletcher_echo.so'] if 'AUDITWHEEL_PLAT' in os.environ else []),
162+
zip_safe=False,
163+
data_files=[
164+
('lib', [output_dir + '/lib64/libfletcher_echo.so']
165+
if 'AUDITWHEEL_PLAT' in os.environ else []),
157166
],
158167
)

0 commit comments

Comments
 (0)