Merge pull request #15 from jbrhm/devel

Fix Packaging

CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_C_COMPILER "/usr/bin/clang-18")
 set(CMAKE_CUDA_FLAGS -allow-unsupported-compiler)
 
 project(cupybara 
-	VERSION 1.0.1
+	VERSION 1.0.2
 	LANGUAGES CXX C CUDA
 )
 

README.md

@@ -6,7 +6,7 @@
 ## Installation
 - Download the latest release of Cupybara using the release tab on the right
 - Cd to the directory the wheel was downloaded
-- Run `sudo pip install --force-reinstall cupybara-1.0.1-py3-none-any.whl`
+- Run `sudo pip install --force-reinstall cupybara-1.0.2-py3-none-any.whl`
 
 ## Performance
 **Performance Measured On 1000x1000 Matrices**

build.sh

@@ -5,4 +5,4 @@ cmake --install build
 cd package/
 python3 -m build
 cd dist
-sudo pip install --force-reinstall cupybara-1.0.1-py3-none-any.whl
+sudo pip install --force-reinstall cupybara-1.0.2-py3-none-any.whl

cmake/installation.cmake

@@ -1,5 +1,5 @@
 # Destiantion for all of the deps
-set(CUPYBARA_PACKAGE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/package/cupybara_jbrhm)
+set(CUPYBARA_PACKAGE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/package/cupybara)
 set(CUPYBARA_INSTALLATION_DIR ${CUPYBARA_PACKAGE_DIR}/lib)
 set(CUPYBARA_LIB_DIR ${CMAKE_BINARY_DIR}/libcupybara.so)
 file(
@@ -20,8 +20,8 @@ install(FILES ${CUPYBARA_LIB_DIR} DESTINATION ${CUPYBARA_INSTALLATION_DIR})
 
 # Install Shared Library Dependencies
 install(CODE [[
-        set(CUPYBARA_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/package/cupybara_jbrhm/lib/libcupybara.so)
-        set(CUPYBARA_INSTALLATION_DIR ${CMAKE_CURRENT_SOURCE_DIR}/package/cupybara_jbrhm/lib)
+        set(CUPYBARA_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/package/cupybara/lib/libcupybara.so)
+        set(CUPYBARA_INSTALLATION_DIR ${CMAKE_CURRENT_SOURCE_DIR}/package/cupybara/lib)
 
         message("Installing: ${CUPYBARA_LIB_DIR}")
 

package/cupybara/cupybara.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from cupybara_jbrhm.cupybara_paths import CupybaraPaths
+from cupybara.cupybara_paths import CupybaraPaths
 
 lib = CDLL(CupybaraPaths.cupybara_libs) 
 
@@ -65,4 +65,4 @@ def sync(self):
     # Overloaded Matrix Multiplication
     @staticmethod
     def multiply(A, B, C):
-        lib.multiply(A.matrix, B.matrix, C.matrix)
+        lib.multiply(A.matrix, B.matrix, C.matrix)

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cupybara"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
   { name="jbrhm", email="[email protected]" },
 ]