From 9e71541c3d0c794297e55ad2b75273c22b3951a0 Mon Sep 17 00:00:00 2001 From: akashdhruv Date: Wed, 28 Jun 2023 17:51:35 -0500 Subject: [PATCH 01/25] update workflow --- .github/workflows/draft-pdf.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/draft-pdf.yml b/.github/workflows/draft-pdf.yml index 04dc44bc..01e2f72b 100644 --- a/.github/workflows/draft-pdf.yml +++ b/.github/workflows/draft-pdf.yml @@ -2,6 +2,7 @@ on: push: branches: - main + - joss-paper jobs: paper: From fd328c21afef96793750543d56d3a5f14c0f86aa Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Mon, 10 Jul 2023 13:12:06 -0500 Subject: [PATCH 02/25] fix paper.bib --- paper/paper.bib | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/paper/paper.bib b/paper/paper.bib index 36a0b4e0..2e8ead97 100644 --- a/paper/paper.bib +++ b/paper/paper.bib @@ -5,16 +5,19 @@ @article{DUBEY2022 Pages = {101168}, Year = {2022}, issn = {2352-7110}, - doi = {https://doi.org/10.1016/j.softx.2022.101168}, + doi = {10.1016/j.softx.2022.101168}, url = {https://www.sciencedirect.com/science/article/pii/S2352711022001030}, Author = {Anshu Dubey and Klaus Weide and Jared O’Neal and Akash Dhruv and Sean Couch and J. Austin Harris and Tom Klosterman and Rajeev Jain and Johann Rudi and Bronson Messer and Michael Pajkos and Jared Carlson and Ran Chu and Mohamed Wahib and Saurabh Chawdhary and Paul M. Ricker and Dongwook Lee and Katie Antypas and Katherine M. Riley and Christopher Daley and Murali Ganapathy and Francis X. Timmes and Dean M. Townsley and Marcos Vanella and John Bachan and Paul M. Rich and Shravan Kumar and Eirik Endeve and W. Raphael Hix and Anthony Mezzacappa and Thomas Papatheodore} } -@article{DHRUV2023, - Author = {Akash Dhruv}, - Title = {A Vortex Damping Outflow Forcing for Multiphase Flows with Sharp Interfacial Jumps}, - Year = {2023}, - Journal = {Under Review} +@misc{DHRUV2023, + title={A Vortex Damping Outflow Forcing for Multiphase Flows with Sharp Interfacial Jumps}, + author={Akash Dhruv}, + year={2023}, + eprint={2306.10174}, + archivePrefix={arXiv}, + primaryClass={physics.flu-dyn}, + url={https://arxiv.org/abs/2306.10174} } @dataset{HASSAN2023, From bfbe2836a20f3a6aab0b97dd922cb7566990afde Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Tue, 11 Jul 2023 20:44:50 -0500 Subject: [PATCH 03/25] update paper and license info --- NOTICE | 2 +- boxkit/__meta__.py | 6 +++--- paper/paper.md | 9 ++++++++- setup.py | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/NOTICE b/NOTICE index ffa3992c..28858458 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Copyright (c) 2023 UChicago Argonne, LLC and contributors. All rights reserved. +Copyright (c) 2023 UChicago Argonne LLC and contributors. All rights reserved. Title: BoxKit (SF-23-067) diff --git a/boxkit/__meta__.py b/boxkit/__meta__.py index 9b4a7235..d7fe2d99 100644 --- a/boxkit/__meta__.py +++ b/boxkit/__meta__.py @@ -1,8 +1,8 @@ """Metadata for BoxKit package""" __pkgname__ = "BoxKit" -__version__ = "2023.06.7" +__version__ = "2023.07" __authors__ = "Akash Dhruv" -__license__ = "Apache License" -__copyright__ = "Copyright (c) Akash Dhruv 2023. All Rights Reserved." +__license__ = "Apache Software License" +__copyright__ = "Copyright (c) 2023 UChicago Argonne LLC and contributors. All Rights Reserved." __description__ = "BoxKit utility" diff --git a/paper/paper.md b/paper/paper.md index 2280adc0..1444fe2d 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -45,6 +45,12 @@ memory in form of chunks/blocks which improves cache efficiency. The library als creation of new datasets for data-intensive workflows, and can be extended beyond its current application to numerical simulations. +Compared to existing data analysis packages like yt [@yt], BoxKit offers more intuitive +abstraction layers over AMR blocks through its metadata wrappers. This provides raw access +to simulation data enabling users to develop their own low-level methods for spatio-temporal +interpolation and stenciled computations. We aim for this library to complement existing +packages rather than replace them. + ![BoxKit is designed to integrate simulation software instruments like Flash-X with Python-based machine learning and data analysis packages. Large simulation datasets (~10 GB) can leverage BoxKit to improve performance of offline training/analysis. @@ -68,7 +74,8 @@ def operation_on_block(block, *args): pass # Call the function with list of blocks as the first argument -operation_on_block((block for block in list_of_blocks), *args) +dset = boxkit.read_datset(...) +operation_on_block((block for block in dset.blocklist), *args) ``` The `Action` wrapper converts the function, `operation_on_block`, into a parallel method which diff --git a/setup.py b/setup.py index 66015a57..87b80646 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ long_description=long_description, classifiers=[ "Programming Language :: Python :: 3.8", - "License :: OSI Approved :: MIT License", + "License :: OSI Approved :: Apache Software License", ], install_requires=DEPENDENCIES, cmdclass={ From cf1e9e974ec9dac1f5beb1432a7440753a7a4ca0 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Tue, 11 Jul 2023 20:50:48 -0500 Subject: [PATCH 04/25] update paper --- paper/paper.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/paper/paper.md b/paper/paper.md index 1444fe2d..02a908c1 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -45,18 +45,18 @@ memory in form of chunks/blocks which improves cache efficiency. The library als creation of new datasets for data-intensive workflows, and can be extended beyond its current application to numerical simulations. -Compared to existing data analysis packages like yt [@yt], BoxKit offers more intuitive -abstraction layers over AMR blocks through its metadata wrappers. This provides raw access -to simulation data enabling users to develop their own low-level methods for spatio-temporal -interpolation and stenciled computations. We aim for this library to complement existing -packages rather than replace them. - ![BoxKit is designed to integrate simulation software instruments like Flash-X with Python-based machine learning and data analysis packages. Large simulation datasets (~10 GB) can leverage BoxKit to improve performance of offline training/analysis. This mechanism is part of a broader workflow to integrate simulations with machine learning using a Fortran-Python bridge shown with dotted lines. \label{fig:workflow}](../media/workflow.png) +Compared to existing data analysis packages like yt [@yt], BoxKit offers more intuitive +abstraction layers over AMR blocks through its metadata wrappers. This provides raw access +to simulation data enabling users to develop their own low-level methods for spatio-temporal +interpolation and stenciled computations. We aim for this library to complement existing +packages rather than replace them. + BoxKit also offers wrappers to scale the process of deploying workflows on NUMA and distributed computing architectures by providing decorators that can parallelize Python operations over a single data structure to operate over a list. This can be understood better using the From 630dcb7e72f6ef2151c69442eba7090d9b16de56 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Tue, 11 Jul 2023 20:51:12 -0500 Subject: [PATCH 05/25] update draft --- .github/workflows/draft-pdf.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/draft-pdf.yml b/.github/workflows/draft-pdf.yml index 01e2f72b..c9c700cd 100644 --- a/.github/workflows/draft-pdf.yml +++ b/.github/workflows/draft-pdf.yml @@ -2,7 +2,7 @@ on: push: branches: - main - - joss-paper + - development jobs: paper: From b87eb11359087127d822b1cf36f7e9e04a523b2d Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Tue, 11 Jul 2023 21:00:38 -0500 Subject: [PATCH 06/25] provide link to preformance data --- paper/paper.bib | 5 +++++ paper/paper.md | 3 +++ 2 files changed, 8 insertions(+) diff --git a/paper/paper.bib b/paper/paper.bib index 2e8ead97..9ea09df1 100644 --- a/paper/paper.bib +++ b/paper/paper.bib @@ -71,3 +71,8 @@ @misc{summit year = 2023, howpublished = {\url{https://www.olcf.ornl.gov/summit/}}, } + +@misc{boxkit-performance, + title={{BoxKit Performance}}, + howpublished= {\url{https://github.com/akashdhruv/boxkit-performance}}, +} diff --git a/paper/paper.md b/paper/paper.md index 02a908c1..2538f8e9 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -118,6 +118,9 @@ where global operations in space are required. An example of this is SciKit's for Flash-X boiling simulations. BoxKit improves performance of this operation by ~5x. +Raw data for performance results along with corresponding IPython notebooks can +be found in [@boxkit-performance]. + # Ongoing work Our ongoing work focuses on using BoxKit to improve performance of Scientific From a04cf8aaf5fa7361b9dc508f3977967451d39d0f Mon Sep 17 00:00:00 2001 From: akashdhruv Date: Tue, 11 Jul 2023 23:31:06 -0500 Subject: [PATCH 07/25] update paper --- paper/paper.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper/paper.md b/paper/paper.md index 2538f8e9..3d5e675f 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -123,7 +123,7 @@ be found in [@boxkit-performance]. # Ongoing work -Our ongoing work focuses on using BoxKit to improve performance of Scientific +Our ongoing work focuses on developing BoxKit to improve performance of Scientific Machine Learning (SciML) applications and using it as part of a broader workflow that integrates Fortran/C++ based applications with state-of-art machine learning packages available in Python shown by dotted lines in \autoref{fig:workflow}. From 569c5c20e5f205875aa0a3b526a85a3fbd0df422 Mon Sep 17 00:00:00 2001 From: akashdhruv Date: Tue, 11 Jul 2023 23:32:22 -0500 Subject: [PATCH 08/25] update paper again --- paper/paper.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/paper/paper.md b/paper/paper.md index 3d5e675f..a8bd9524 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -116,10 +116,8 @@ Mapping of AMR data to contingous arrays becomes important for applications where global operations in space are required. An example of this is SciKit's ``skimage_measure`` method, which can be used to measure bubble shape and size for Flash-X boiling simulations. BoxKit improves performance of this operation -by ~5x. - -Raw data for performance results along with corresponding IPython notebooks can -be found in [@boxkit-performance]. +by ~5x. Raw data for these performance results along with corresponding IPython +notebooks can be found in [@boxkit-performance]. # Ongoing work From 75e252e49e1a9de44dc1b13528704b8c94c57fef Mon Sep 17 00:00:00 2001 From: akashdhruv Date: Tue, 11 Jul 2023 23:37:43 -0500 Subject: [PATCH 09/25] fix some text --- paper/paper.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paper/paper.md b/paper/paper.md index a8bd9524..1a52b8d6 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -116,7 +116,7 @@ Mapping of AMR data to contingous arrays becomes important for applications where global operations in space are required. An example of this is SciKit's ``skimage_measure`` method, which can be used to measure bubble shape and size for Flash-X boiling simulations. BoxKit improves performance of this operation -by ~5x. Raw data for these performance results along with corresponding IPython +by ~5x. Data for these performance studies along with corresponding IPython notebooks can be found in [@boxkit-performance]. # Ongoing work @@ -124,7 +124,7 @@ notebooks can be found in [@boxkit-performance]. Our ongoing work focuses on developing BoxKit to improve performance of Scientific Machine Learning (SciML) applications and using it as part of a broader workflow that integrates Fortran/C++ based applications with state-of-art machine learning -packages available in Python shown by dotted lines in \autoref{fig:workflow}. +packages available in Python as highlighted in \autoref{fig:workflow}. # Acknowledgements From c59e8c3b26f37e6270e1f6ceffeb76569c90e97c Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Wed, 12 Jul 2023 16:32:04 -0500 Subject: [PATCH 10/25] change enabling --> allowing --- paper/paper.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper/paper.md b/paper/paper.md index 2538f8e9..c0a1274e 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -53,7 +53,7 @@ learning using a Fortran-Python bridge shown with dotted lines. \label{fig:workf Compared to existing data analysis packages like yt [@yt], BoxKit offers more intuitive abstraction layers over AMR blocks through its metadata wrappers. This provides raw access -to simulation data enabling users to develop their own low-level methods for spatio-temporal +to simulation data allowing users to develop their own low-level methods for spatio-temporal interpolation and stenciled computations. We aim for this library to complement existing packages rather than replace them. From f992d12907f347d51ef678ed437bcd2c660b0a75 Mon Sep 17 00:00:00 2001 From: akashdhruv Date: Fri, 14 Jul 2023 16:22:10 -0500 Subject: [PATCH 11/25] update NOTICE --- NOTICE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE b/NOTICE index 28858458..6835e0f8 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Copyright (c) 2023 UChicago Argonne LLC and contributors. All rights reserved. +Copyright (c) 2023 UChicago Argonne LLC. All rights reserved. Title: BoxKit (SF-23-067) From ff7d50f00228bc938e6b429691c5b258c85c9dda Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 7 Sep 2023 12:16:10 -0500 Subject: [PATCH 12/25] update paper --- paper/paper.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper/paper.md b/paper/paper.md index 2ada0582..2bc55e95 100644 --- a/paper/paper.md +++ b/paper/paper.md @@ -114,7 +114,7 @@ increases. Mapping of AMR data to contingous arrays becomes important for applications where global operations in space are required. An example of this is SciKit's -``skimage_measure`` method, which can be used to measure bubble shape and size +``skimage.measure`` method, which can be used to measure bubble shape and size for Flash-X boiling simulations. BoxKit improves performance of this operation by ~5x. Data for these performance studies along with corresponding IPython notebooks can be found in [@boxkit-performance]. From 4e06024ecbf60224c6fed6535276269f44cc0f8e Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 14:38:54 -0500 Subject: [PATCH 13/25] update workflows --- .github/workflows/minimal.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index f4e0c601..c8480051 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -1,6 +1,8 @@ name: Minimal on: + push: + - development pull_request: branches: - main @@ -13,6 +15,24 @@ on: jobs: + windows: + name: "windows" + runs-on: windows-latest + - uses: actions/checkout@v2 + - uses: akashdhruv/Maple/.github/actions/maple@main + - name: Build Container + run: | + maple image build boxkit + - uses: ./.github/actions/install + with: + image: boxkit + - name: Run BoxKit tests + run: | + maple container pour --image=boxkit + maple container execute "python3 tests/container/create.py" + maple container rinse + maple image delete boxkit + library: name: "library" runs-on: ubuntu-latest From 472723a694962763f52ef821cd2ab1e07e168dcb Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 14:42:27 -0500 Subject: [PATCH 14/25] update minimal --- .github/workflows/minimal.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index c8480051..3ae24049 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -32,9 +32,9 @@ jobs: maple container execute "python3 tests/container/create.py" maple container rinse maple image delete boxkit - - library: - name: "library" + + ubuntu: + name: "ubuntu" runs-on: ubuntu-latest steps: #- name: Login to Docker Hub From 2c983f73cbfa902a517d151fbea99f6352343188 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 14:44:28 -0500 Subject: [PATCH 15/25] update names --- .github/workflows/minimal.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index 3ae24049..bca9ea29 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -15,8 +15,8 @@ on: jobs: - windows: - name: "windows" + windows-platform: + name: "windows-platform" runs-on: windows-latest - uses: actions/checkout@v2 - uses: akashdhruv/Maple/.github/actions/maple@main @@ -33,8 +33,8 @@ jobs: maple container rinse maple image delete boxkit - ubuntu: - name: "ubuntu" + ubuntu-platform: + name: "ubuntu-platform" runs-on: ubuntu-latest steps: #- name: Login to Docker Hub From 0ef636a180a07f920a4533550cec620924393c71 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 14:46:19 -0500 Subject: [PATCH 16/25] update names --- .github/workflows/minimal.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index bca9ea29..30d5f139 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -15,9 +15,10 @@ on: jobs: - windows-platform: - name: "windows-platform" + windows: + name: "windows" runs-on: windows-latest + steps: - uses: actions/checkout@v2 - uses: akashdhruv/Maple/.github/actions/maple@main - name: Build Container @@ -33,8 +34,8 @@ jobs: maple container rinse maple image delete boxkit - ubuntu-platform: - name: "ubuntu-platform" + ubuntu: + name: "ubuntu" runs-on: ubuntu-latest steps: #- name: Login to Docker Hub From 27be4526c481c42a626ef048dba89bae6472b4b9 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 14:47:22 -0500 Subject: [PATCH 17/25] change workflow trigger --- .github/workflows/minimal.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index 30d5f139..d4fbc385 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -2,7 +2,8 @@ name: Minimal on: push: - - development + branches: + - development pull_request: branches: - main From a0df59d0dad49f1780f14c15efea6407e5460693 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 14:52:37 -0500 Subject: [PATCH 18/25] update minimal --- .github/workflows/minimal.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index d4fbc385..0c52f0ef 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -21,19 +21,14 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: akashdhruv/Maple/.github/actions/maple@main - - name: Build Container - run: | - maple image build boxkit - - uses: ./.github/actions/install + - uses: actions/setup-python@v4 with: - image: boxkit + python-version: '3.11' - name: Run BoxKit tests run: | - maple container pour --image=boxkit - maple container execute "python3 tests/container/create.py" - maple container rinse - maple image delete boxkit + pip3 install click + ./setup develop --enable-testing + python3 tests/container/create.py ubuntu: name: "ubuntu" From 22bf1198aa001b41f136d78785cf46d5b92c113f Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 14:56:50 -0500 Subject: [PATCH 19/25] update workflows --- .github/workflows/minimal.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index 0c52f0ef..ad5fdbce 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -24,10 +24,15 @@ jobs: - uses: actions/setup-python@v4 with: python-version: '3.11' - - name: Run BoxKit tests + - name: Install dependencies run: | pip3 install click - ./setup develop --enable-testing + pip3 install -r requirements/core.txt + - name: Run setup + run: | + python3 setup.py develop --user + - name: Run tests + run: | python3 tests/container/create.py ubuntu: From 29d3472ad7a3e4c97c288c15f6398fae6a655b59 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 14:59:26 -0500 Subject: [PATCH 20/25] update current directory paths --- bin/boost.py | 4 ++-- bin/cbox.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/boost.py b/bin/boost.py index efda962d..1978f4e5 100644 --- a/bin/boost.py +++ b/bin/boost.py @@ -21,7 +21,7 @@ def boost_build(): "cd submodules/boost && ./bootstrap.sh" + f" --with-python-version={get_python_version()}" + " --with-toolset=gcc" - + f" --prefix={os.getenv('PWD')}/boxkit/depends/boost && ./b2 install", + + f" --prefix={os.getcwd()}/boxkit/depends/boost && ./b2 install", shell=True, check=True, executable="/bin/bash", @@ -40,7 +40,7 @@ def boost_clean(): def boost_install(): """Install Boost library""" - if os.path.exists(os.getenv("PWD") + "/boxkit/depends/boost"): + if os.path.exists(os.getcwd() + "/boxkit/depends/boost"): subprocess.run( "mkdir -pv build/lib/boxkit/depends/boost/lib", shell=True, diff --git a/bin/cbox.py b/bin/cbox.py index 7e860df3..a3dadbc8 100644 --- a/bin/cbox.py +++ b/bin/cbox.py @@ -17,13 +17,13 @@ "boost_version": "".join(sysconfig.get_python_version().split(".")), "python_include_path": sysconfig.get_python_inc(), "boost_include_path": ( - os.getenv("PWD") + "/boxkit/depends/boost/include" - if os.path.exists(os.getenv("PWD") + "/boxkit/depends/boost") + os.getcwd() + "/boxkit/depends/boost/include" + if os.path.exists(os.getcwd() + "/boxkit/depends/boost") else os.getenv("BOOST_INCLUDE_DIR") ), "boost_lib_path": ( - os.getenv("PWD") + "/boxkit/depends/boost/lib" - if os.path.exists(os.getenv("PWD") + "/boxkit/depends/boost") + os.getcwd() + "/boxkit/depends/boost/lib" + if os.path.exists(os.getcwd() + "/boxkit/depends/boost") else os.getenv("BOOST_LIB_DIR") ), } From 141b31e3a81cafdca998a0129c6fc30ba4e1ec5d Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 15:12:22 -0500 Subject: [PATCH 21/25] fix setup for windows --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 87b80646..481778bc 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ author=metadata["__authors__"], description=metadata["__description__"], license=metadata["__license__"], - packages=find_packages(where="./"), + packages=find_packages(where=os.getcwd()), package_dir={"": "./"}, package_data={ "": [ From 641455fb29e5bbf2bf0205b3eec3857b190cad51 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 15:31:41 -0500 Subject: [PATCH 22/25] test new setup on github --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 481778bc..5dbb0c7e 100644 --- a/setup.py +++ b/setup.py @@ -46,8 +46,8 @@ author=metadata["__authors__"], description=metadata["__description__"], license=metadata["__license__"], - packages=find_packages(where=os.getcwd()), - package_dir={"": "./"}, + packages=find_packages(where=os.path.dirname(os.path.abspath(__file__))), + package_dir={"": os.path.dirname(os.path.abspath(__file__))}, package_data={ "": [ "options.py", From 5d1f0b525c4e159b4c9bc475f46fc2aeaae17cc1 Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 15:50:32 -0500 Subject: [PATCH 23/25] update setup --- setup.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 5dbb0c7e..b2ddab60 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ import os import sys import re +import platform from setuptools import setup, find_packages sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) @@ -40,14 +41,19 @@ # Call setup command with necessary arguments # replace existing build and develop commands # with custom commands defined in 'bin.cmd' +if platform.system() == "Windows": + PACKAGE_DIR = ":\\" +else: + PACKAGE_DIR = "./" + setup( name=metadata["__pkgname__"], version=metadata["__version__"], author=metadata["__authors__"], description=metadata["__description__"], license=metadata["__license__"], - packages=find_packages(where=os.path.dirname(os.path.abspath(__file__))), - package_dir={"": os.path.dirname(os.path.abspath(__file__))}, + packages=find_packages(where=PACKAGE_DIR), + package_dir={"": PACKAGE_DIR}, package_data={ "": [ "options.py", From 6782a2f48ad0c94af8e36925f1f52185857f3c3d Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 15:52:40 -0500 Subject: [PATCH 24/25] update setup again --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b2ddab60..3e0b6e4e 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ # replace existing build and develop commands # with custom commands defined in 'bin.cmd' if platform.system() == "Windows": - PACKAGE_DIR = ":\\" + PACKAGE_DIR = ".\\" else: PACKAGE_DIR = "./" From bf88d2fa7323e9695529736fdd1d8f3f9d70788b Mon Sep 17 00:00:00 2001 From: Akash Dhruv Date: Thu, 28 Sep 2023 15:54:45 -0500 Subject: [PATCH 25/25] update version --- .github/workflows/minimal.yml | 2 +- boxkit/__meta__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/minimal.yml b/.github/workflows/minimal.yml index ad5fdbce..1a2afc9d 100644 --- a/.github/workflows/minimal.yml +++ b/.github/workflows/minimal.yml @@ -30,7 +30,7 @@ jobs: pip3 install -r requirements/core.txt - name: Run setup run: | - python3 setup.py develop --user + python3 setup.py install --user - name: Run tests run: | python3 tests/container/create.py diff --git a/boxkit/__meta__.py b/boxkit/__meta__.py index d7fe2d99..c574b6e5 100644 --- a/boxkit/__meta__.py +++ b/boxkit/__meta__.py @@ -1,7 +1,7 @@ """Metadata for BoxKit package""" __pkgname__ = "BoxKit" -__version__ = "2023.07" +__version__ = "2023.9.1" __authors__ = "Akash Dhruv" __license__ = "Apache Software License" __copyright__ = "Copyright (c) 2023 UChicago Argonne LLC and contributors. All Rights Reserved."