update first working verison

Author: namtranase

.gitignore

@@ -157,4 +157,4 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+#.idea/

.pre-commit-config.yaml

@@ -0,0 +1,18 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+
+-   repo: https://github.com/psf/black
+    rev: 22.10.0
+    hooks:
+    -   id: black
+
+-   repo: https://github.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+    -   id: flake8

CMakeLists.txt

@@ -22,15 +22,13 @@ add_subdirectory(vendor/pybind11)
 #add_subdirectory(vendor/gemma.cpp)
 
 # Create the Python module
-pybind11_add_module(gemma_cpp src/pygemma.cpp)
+pybind11_add_module(pygemma src/gemma_binding.cpp)
 
-target_link_libraries(gemma_cpp PRIVATE libgemma hwy hwy_contrib sentencepiece)
+target_link_libraries(pygemma PRIVATE libgemma hwy hwy_contrib sentencepiece)
 
 # Link against libgemma.a and any other necessary libraries
 # After linking, try to include the directories. Adjust this if necessary.
 FetchContent_GetProperties(gemma)
 FetchContent_GetProperties(sentencepiece)
-target_include_directories(gemma_cpp PRIVATE ${gemma_SOURCE_DIR})
-target_include_directories(gemma_cpp PRIVATE ${sentencepiece_SOURCE_DIR})
-
-
+target_include_directories(pygemma PRIVATE ${gemma_SOURCE_DIR})
+target_include_directories(pygemma PRIVATE ${sentencepiece_SOURCE_DIR})

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Nam D. Tran
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -15,4 +15,4 @@ pip install .
 Or install it
 ```
 pip install gemma-cpp-python
-```
+```

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools", "wheel", "pybind11"]
-build-backend = "setuptools.build_meta"
+requires = ["setuptools", "wheel", "cmake", "pybind11"]
+build-backend = "setuptools.build_meta"

requirements.txt

@@ -1 +1,2 @@
-pybind11
+pybind11
+pre-commit

setup.py

@@ -1,41 +1,76 @@
-from setuptools import setup, Extension, find_packages
+import os
+import subprocess
+import sys
+from setuptools import setup, find_packages, Extension
 from setuptools.command.build_ext import build_ext
-import pybind11
 
 
-class CustomBuildExt(build_ext):
-    def build_extensions(self):
-        # Customize the build process here if needed
-        build_ext.build_extensions(self)
+class CMakeExtension(Extension):
+    def __init__(self, name, sourcedir=""):
+        Extension.__init__(self, name, sources=[])
+        self.sourcedir = os.path.abspath(sourcedir)
 
-# Include the pybind11 include directory
-pybind11_include_dir = pybind11.get_include()
 
-ext_modules = [
-    Extension(
-        'gemma_cpp_extension',  # Name of the module to import in Python
-        ['src/binding.cc', 'vendor/gemma.cpp/gemma.cc', 'vendor/gemma.cpp/run.cc'],  # Source files
-        include_dirs=[pybind11_include_dir, './src/include', './vendor/gemma.cpp/compression', './vendor/gemma.cpp/util'],  # Include directories
-        language='c++',
-        extra_compile_args=['-std=c++11'],  # Replace with your required C++ version
-    ),
-]
+class CMakeBuild(build_ext):
+    def run(self):
+        try:
+            out = subprocess.check_output(["cmake", "--version"])
+        except OSError:
+            raise RuntimeError(
+                "CMake must be installed to build the following extensions: "
+                + ", ".join(e.name for e in self.extensions)
+            )
+
+        for ext in self.extensions:
+            self.build_extension(ext)
+
+    def build_extension(self, ext):
+        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
+        cmake_args = [
+            "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir,
+            "-DPYTHON_EXECUTABLE=" + sys.executable,
+        ]
+
+        cfg = "Debug" if self.debug else "Release"
+        build_args = ["--config", cfg]
+
+        # Add a parallel build option
+        build_args += [
+            "--",
+            "-j",
+            "12",
+        ]  # Specifies the number of jobs to run simultaneously
+
+        if not os.path.exists(self.build_temp):
+            os.makedirs(self.build_temp)
+
+        subprocess.check_call(
+            ["cmake", ext.sourcedir] + cmake_args, cwd=self.build_temp
+        )
+        subprocess.check_call(
+            ["cmake", "--build", ".", "--target", ext.name] + build_args,
+            cwd=self.build_temp,
+        )
+
 
 setup(
-    name='gemma-cpp-python',
-    version='0.1.0',
-    author='Nam Tran',
-    author_email='trannam.ase@gmail.com',
-    description='A Python wrapper for the GEMMA C++ library',
-    long_description=open('README.md').read(),
-    long_description_content_type='text/markdown',
+    name="pygemma",
+    version="0.1.0",
+    author="Nam Tran",
+    author_email="namtran.ase@gmail.com",
+    description="A Python package with a C++ backend using gemma.",
+    long_description="""
+    This package provides Python bindings to a C++ library using pybind11.
+    """,
+    long_description_content_type="text/markdown",
+    ext_modules=[CMakeExtension("pygemma")],
+    cmdclass=dict(build_ext=CMakeBuild),
+    zip_safe=False,
     packages=find_packages(),
-    ext_modules=ext_modules,
-    cmdclass={
-        'build_ext': CustomBuildExt,
-    },
-    # Add all other necessary package metadata
-    install_requires=[
-        'pybind11>=2.6',
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
     ],
-)
+    python_requires=">=3.8",
+)