From d7c0fbc7201a78fa9cd925d34b45482ba15c83a6 Mon Sep 17 00:00:00 2001 From: "Paul M. Sutter" Date: Wed, 22 May 2024 18:51:20 -0400 Subject: [PATCH] renamed void_pipeline to vide_pipeline --- CMakeLists.txt | 4 ++-- README.md | 10 +++++----- .../{void_pipeline => vide_pipeline}/__init__.py | 0 .../{void_pipeline => vide_pipeline}/__main__.py | 2 +- setup.py | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename python_source/{void_pipeline => vide_pipeline}/__init__.py (100%) rename python_source/{void_pipeline => vide_pipeline}/__main__.py (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6538256..25fb0eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ ELSE() ENDIF() SET(PYTHONPATH ${PYTHON_LOCAL_SITE_PACKAGE}) -configure_exec(${CMAKE_SOURCE_DIR}/python_src/pipeline_source/prepareInputs.in.py +configure_exec(${CMAKE_SOURCE_DIR}/python_source/pipeline_source/prepareInputs.in.py ${CMAKE_BINARY_DIR}/pipeline prepareInputs.py) #configure_exec(${CMAKE_SOURCE_DIR}/python_tools/pipeline_source/applyMaskToMock.in.py #${CMAKE_BINARY_DIR}/pipeline applyMaskToMock.py) @@ -106,4 +106,4 @@ message(STATUS "Vide binary directory: ${VIDE_BIN}") #) -subdirs(c_src) +subdirs(c_source) diff --git a/README.md b/README.md index 0fa877c..c697861 100644 --- a/README.md +++ b/README.md @@ -79,11 +79,11 @@ After installing the package with To test that the package is indeed installed you can execute ``` -python3 -m void_pipeline +python3 -m vide_pipeline ``` which will state ``` -Usage: ./generateCatalog.py parameter_file.py +Usage: python3 -m vide_pipeline parameter_file.py ``` The VIDE tools are all packaged in the `vide` package. @@ -98,17 +98,17 @@ The script generates mock catalog and a default pipeline to handle simulations. An example of the complete procedure is given here-below: ``` mkdir $HOME/my_vide_test -cp python_tools/void_pipeline/datasets/example_simulation.py $HOME/my_vide_test +cp python_tools/vide_pipeline/datasets/example_simulation.py $HOME/my_vide_test mkdir $HOME/my_vide_test/examples cp examples/example_simulation_z0.0.dat $HOME/my_vide_test/examples cd $HOME/my_vide_test vide_prepare_simulation --all --parm example_simulation.py -python3 -m void_pipeline example_simulation/sim_ss1.0.py +python3 -m vide_pipeline example_simulation/sim_ss1.0.py ``` The example copies the required data in a separate directory. Then, we execute the `vide_prepare_simulation` script to generate the auxiliary pipeline. The -`void_pipeline` is finally executed on this generated script. +`vide_pipeline` is finally executed on this generated script. Notes for CONDA --------------- diff --git a/python_source/void_pipeline/__init__.py b/python_source/vide_pipeline/__init__.py similarity index 100% rename from python_source/void_pipeline/__init__.py rename to python_source/vide_pipeline/__init__.py diff --git a/python_source/void_pipeline/__main__.py b/python_source/vide_pipeline/__main__.py similarity index 98% rename from python_source/void_pipeline/__main__.py rename to python_source/vide_pipeline/__main__.py index 1fca302..a14bf9b 100644 --- a/python_source/void_pipeline/__main__.py +++ b/python_source/vide_pipeline/__main__.py @@ -32,7 +32,7 @@ import pickle # ------------------------------------------------------------------------------ if (len(sys.argv) == 1): - print("Usage: python3 -m void_pipeline parameter_file.py") + print("Usage: python3 -m vide_pipeline parameter_file.py") exit(-1) if (len(sys.argv) > 1): diff --git a/setup.py b/setup.py index 0afebfd..00c7ec7 100644 --- a/setup.py +++ b/setup.py @@ -207,9 +207,9 @@ class VideScripts(build_scripts): vide_extension = CMakeExtension(name="vide") setup(name='vide', - version='2.0', - packages=find_packages('python_src'), - package_dir={'': 'python_src'}, + version='3.0', + packages=find_packages('python_source'), + package_dir={'': 'python_source'}, setup_requires=['cython','setuptools','healpy','argparse','scipy','astropy','extension-helpers','netCDF4'], install_requires=['argparse','scipy','astropy','extension-helpers','netCDF4','healpy'], ext_modules=[vide_extension],