Update setup and versioning

Saurav Agarwal · Saurav Agarwal · commit 52b74472d6f0 · 2024-02-27T18:41:23.000-05:00
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+1.0
diff --git a/cppsrc/core/CMakeLists.txt b/cppsrc/core/CMakeLists.txt
@@ -1,5 +1,15 @@
-cmake_minimum_required(VERSION 3.22)
-project(CoverageControl VERSION 0.3 LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.16)
+project(CoverageControl LANGUAGES CXX)
+
+# Check if file VERSION exists
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION")
+	file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION" VERSION)
+	string(STRIP ${VERSION} VERSION)
+	set(${PROJECT_NAME}_VERSION ${VERSION})
+else()
+	message(WARNING "VERSION file not found, using 0.0 as default version")
+	set(${PROJECT_NAME}_VERSION 0.0)
+endif()
 
 if (NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release)
diff --git a/cppsrc/core/cmake/CoverageControlConfig.h.in b/cppsrc/core/cmake/CoverageControlConfig.h.in
@@ -1,4 +1,3 @@
 // the configured options and settings for CoverageControl
-#define CoverageControl_VERSION_MAJOR @CoverageControl_VERSION_MAJOR@
-#define CoverageControl_VERSION_MINOR @CoverageControl_VERSION_MINOR@
+#define CoverageControl_VERSION @CoverageControl_VERSION@
 #cmakedefine WITH_CUDA
diff --git a/cppsrc/core/python_bindings/pyproject.toml b/cppsrc/core/python_bindings/pyproject.toml
@@ -4,12 +4,12 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "CoverageControl"
-version = "0.4.0"
+version = "1.0"
 description="Project for Coverage Control"
 requires-python = ">=3.10"
 dependencies = [ "numpy" ]
 authors = [
-  {name = "Saurav Agarwal", email = "SauravAg@UPenn.edu" } # Optional
+  {name = "Saurav Agarwal", email = "SauravAg@UPenn.edu" }
 ]
 
 [tool.setuptools]
diff --git a/cppsrc/core/python_bindings/src/CoverageControl/__init__.py b/cppsrc/core/python_bindings/src/CoverageControl/__init__.py
diff --git a/cppsrc/core/python_bindings/src/coverage_control_python_binds.cpp b/cppsrc/core/python_bindings/src/coverage_control_python_binds.cpp
@@ -23,10 +23,19 @@
 
 #include "../core_binds.h"
 
+#include <CoverageControlConfig.h>
 #include <CoverageControl/coverage_system.h>
 using namespace CoverageControl;
 
 PYBIND11_MODULE(CoverageControl, m) {
 	pyCoverageControl_core(m);
 	pyCoverageControl_core_coverage_system(m);
+
+	/* m.attr("__version__") = CoverageControl_VERSION_MAJOR "." CoverageControl_VERSION_MINOR "." CoverageControl_VERSION_PATCH; */
+#ifdef CoverageControl_VERSION
+	m.attr("__version__") = CoverageControl_VERSION;
+#else
+	m.attr("__version__") = "dev";
+#endif
+
 }
diff --git a/cppsrc/main/CMakeLists.txt b/cppsrc/main/CMakeLists.txt
@@ -1,5 +1,15 @@
-cmake_minimum_required(VERSION 3.22)
-project(CoverageControlMain VERSION 0.3 LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.16)
+project(CoverageControlMain LANGUAGES CXX)
+
+# Check if file VERSION exists
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION")
+	file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION" VERSION)
+	string(STRIP ${VERSION} VERSION)
+	set(${PROJECT_NAME}_VERSION ${VERSION})
+else()
+	message(WARNING "VERSION file not found, using 0.0 as default version")
+	set(${PROJECT_NAME}_VERSION 0.0)
+endif()
 
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release)
diff --git a/cppsrc/setup.sh b/cppsrc/setup.sh
@@ -1,13 +1,21 @@
 #!/usr/bin/env bash
-params="$(getopt -o d:ctpg -l directory:,clean,torch,python,global,with-cuda,with-deps --name "$(basename "$0")" -- "$@")"
+ORIG_INPUT_PARAMS="$@"
+params="$(getopt -o d:hctpg -l directory:,help,clean,torch,python,global,with-cuda,with-deps --name "$(basename "$0")" -- "$@")"
 
 if [ $? -ne 0 ]
 then
-    print_usage
+	print_usage
 fi
 
 print_usage() {
-	printf "bash $0 [-d|--directory <workspace directory>] [-c|--clean] [-t|--torch <build with libtorch>] [-p|--python <install python bindings>] [-g|--global] [--with-cuda <cpu only>] [--with-deps <install dependencies>]\n"
+	printf "bash $0 [-h|--help] [-d|--directory <workspace directory>] [-p|--python] [--with-cuda] [--with-deps] [-g|--global] [-c|--clean] [-t|--torch]\n"
+	printf "Options:\n"
+	printf "  -h, --help                             : Prints this help message\n"
+	printf "  -d, --directory <workspace directory>  : Builds and installs the package in the specified directory\n"
+	printf "  -p, --python                           : Installs the python bindings\n"
+	printf "  --with-cuda                            : Builds the package with CUDA support\n"
+	printf "  --with-deps                            : Installs the dependencies\n"
+	printf "  -g, --global                           : Installs the package globally. Needs sudo permissions\n"
 }
 
 # Get directory of script
@@ -21,7 +29,7 @@ unset params
 INSTALL=true
 while true; do
 	case ${1} in
-		-i|--install) INSTALL=true;shift;;
+		-h|--help) print_usage; exit 0;;
 		-c|--clean) CLEAN=true;INSTALL=false;shift;;
 		-t|--torch) WITH_TORCH=ON; shift;;
 		-p|--python) WITH_PYTHON=true;shift;;
diff --git a/cppsrc/tests/CMakeLists.txt b/cppsrc/tests/CMakeLists.txt
@@ -1,5 +1,15 @@
-cmake_minimum_required(VERSION 3.22)
-project(CoverageControlTests VERSION 0.3 LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.16)
+project(CoverageControlTests LANGUAGES CXX)
+
+# Check if file VERSION exists
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION")
+	file(READ "${CMAKE_CURRENT_SOURCE_DIR}/../../VERSION" VERSION)
+	string(STRIP ${VERSION} VERSION)
+	set(${PROJECT_NAME}_VERSION ${VERSION})
+else()
+	message(WARNING "VERSION file not found, using 0.0 as default version")
+	set(${PROJECT_NAME}_VERSION 0.0)
+endif()
 
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release)
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "CoverageControlTorch"
-version = "0.0.1"
+version = "1.0"
 authors = [
   { name="Saurav Agarwal", email="SauravAg@upenn.edu" },
 ]
diff --git a/setup.sh b/setup.sh
@@ -1,31 +1,41 @@
 #!/usr/bin/env bash
 ORIG_INPUT_PARAMS="$@"
-params="$(getopt -o d:ctpg -l directory:,clean,torch,python,global,with-cuda,with-deps --name "$(basename "$0")" -- "$@")"
+params="$(getopt -o d:hctpg -l directory:,help,clean,torch,python,global,with-cuda,with-deps,pip-path: --name "$(basename "$0")" -- "$@")"
 
 if [ $? -ne 0 ]
 then
 	print_usage
 fi
 
 print_usage() {
-	printf "bash $0 [-d|--directory <workspace directory>] [-c|--clean] [-t|--torch <build with libtorch>] [-p|--python <install python bindings>] [-g|--global] [--with-cuda <cpu only>][--with-deps <install dependencies>]\n"
+	printf "bash $0 [-h|--help] [-d|--directory <workspace directory>] [-p|--python] [--with-cuda] [--with-deps] [-g|--global] [-c|--clean] [-t|--torch]\n"
+	printf "Options:\n"
+	printf "  -h, --help                             : Prints this help message\n"
+	printf "  -d, --directory <workspace directory>  : Builds and installs the package in the specified directory\n"
+	printf "  -p, --python                           : Installs the python bindings\n"
+	printf "  --with-cuda                            : Builds the package with CUDA support\n"
+	printf "  --with-deps                            : Installs the dependencies\n"
+	printf "  -g, --global                           : Installs the package globally. Needs sudo permissions\n"
 }
 
 eval set -- "$params"
+echo "Params: $params"
 unset params
 
 WITH_TORCH=0
 INSTALL=true
 WITH_DEPS=false
 while true; do
 	case ${1} in
+		-h|--help) print_usage; exit 0;;
 		-c|--clean) CLEAN=true;INSTALL=false;shift;;
 		-t|--torch) WITH_TORCH=ON; shift;;
 		-p|--python) WITH_PYTHON=true;shift;;
 		-d|--directory) WS_DIR+=("${2}");shift 2;;
 		-g|--global) GLOBAL=true;shift;;
 		--with-cuda) WITH_CUDA=ON;shift;;
 		--with-deps) WITH_DEPS=true;shift;;
+		--pip-path) PIP_PATH+=("${2}");shift 2;;
 		--) shift;break;;
 		*) print_usage
 			exit 1 ;;
@@ -64,6 +74,8 @@ fi
 if [[ ${WITH_PYTHON} ]]
 then
 	echo "Installing python bindings"
+	echo "pip_path: $(which pip)"
+
 	# pip install --no-build-isolation ${DIR}/cppsrc/core/python_bindings/
 	pip install ${DIR}/cppsrc/core/python_bindings/
 	if [ $? -ne 0 ]; then

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ build-backend = "hatchling.build"`
`4`	`4`
`5`	`5`	`[project]`
`6`	`6`	`name = "CoverageControlTorch"`
`7`		`-version = "0.0.1"`
	`7`	`+version = "1.0"`
`8`	`8`	`authors = [`
`9`	`9`	`{ name="Saurav Agarwal", email="[email protected]" },`
`10`	`10`	`]`