mirror of
https://github.com/zama-ai/concrete.git
synced 2026-02-09 12:15:09 -05:00
chore: use namespace concrete for the py package
Compiler tools such as CompilerEngine would now be imported from concrete.compiler Dialects would now be imported from concrete.lang.dialects And anything related to concretelang can be imported directly from concrete.lang
This commit is contained in:
@@ -152,7 +152,7 @@ release_tarballs:
|
||||
docker container run --rm -v ${PWD}/../tarballs:/tarballs_volume concretefhe-compiler-manylinux:linux_x86_64_tarball cp -r /tarballs/. /tarballs_volume/.
|
||||
|
||||
update_python_version:
|
||||
echo "__version__ = \"`git describe --tags --abbrev=0 | grep -e '[0-9].*' -o`\"" > lib/Bindings/Python/concretelang/version.py
|
||||
echo "__version__ = \"`git describe --tags --abbrev=0 | grep -e '[0-9].*' -o`\"" > lib/Bindings/Python/concrete/version.py
|
||||
|
||||
.PHONY: build-initialized \
|
||||
build-end-to-end-jit \
|
||||
|
||||
@@ -26,11 +26,11 @@ declare_mlir_python_extension(ConcretelangBindingsPythonExtension.Core
|
||||
declare_mlir_python_sources(ConcretelangBindingsPythonSources
|
||||
ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
SOURCES
|
||||
concretelang/__init__.py
|
||||
concretelang/compiler.py
|
||||
concretelang/version.py
|
||||
concretelang/dialects/__init__.py
|
||||
concretelang/dialects/_ods_common.py)
|
||||
concrete/compiler.py
|
||||
concrete/version.py
|
||||
concrete/lang/__init__.py
|
||||
concrete/lang/dialects/__init__.py
|
||||
concrete/lang/dialects/_ods_common.py)
|
||||
|
||||
################################################################################
|
||||
# Declare dialect-specific bindings.
|
||||
@@ -43,18 +43,18 @@ declare_mlir_dialect_python_bindings(
|
||||
ADD_TO_PARENT ConcretelangBindingsPythonSources.Dialects
|
||||
ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
CONCRETELANGBindingsPythonHLFHEOps
|
||||
TD_FILE concretelang/dialects/HLFHEOps.td
|
||||
TD_FILE concrete/lang/dialects/HLFHEOps.td
|
||||
SOURCES
|
||||
concretelang/dialects/hlfhe.py
|
||||
concrete/lang/dialects/hlfhe.py
|
||||
DIALECT_NAME HLFHE)
|
||||
|
||||
declare_mlir_dialect_python_bindings(
|
||||
ADD_TO_PARENT ConcretelangBindingsPythonSources.Dialects
|
||||
ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
CONCRETELANGBindingsPythonHLFHELinalgOps
|
||||
TD_FILE concretelang/dialects/HLFHELinalgOps.td
|
||||
TD_FILE concrete/lang/dialects/HLFHELinalgOps.td
|
||||
SOURCES
|
||||
concretelang/dialects/hlfhelinalg.py
|
||||
concrete/lang/dialects/hlfhelinalg.py
|
||||
DIALECT_NAME HLFHELinalg)
|
||||
|
||||
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
|
||||
"""Concretelang python module"""
|
||||
from mlir._mlir_libs._concretelang import *
|
||||
from .compiler import CompilerEngine, library
|
||||
@@ -14,7 +14,7 @@ def read(fname):
|
||||
def find_version():
|
||||
return re.match(
|
||||
r"__version__ = \"(?P<version>.+)\"",
|
||||
read("lib/Bindings/Python/concretelang/version.py"),
|
||||
read("lib/Bindings/Python/concrete/version.py"),
|
||||
).group("version")
|
||||
|
||||
|
||||
@@ -56,9 +56,9 @@ setuptools.setup(
|
||||
long_description=read("README.md"),
|
||||
long_description_content_type="text/markdown",
|
||||
url="https://github.com/zama-ai/homomorphizer",
|
||||
packages=setuptools.find_packages(
|
||||
packages=setuptools.find_namespace_packages(
|
||||
where=build_dir() + "tools/concretelang/python_packages/concretelang_core",
|
||||
include=["concretelang", "concretelang.*"],
|
||||
include=["concrete", "concrete.*"],
|
||||
)
|
||||
+ setuptools.find_namespace_packages(
|
||||
where=build_dir() + "tools/concretelang/python_packages/concretelang_core",
|
||||
|
||||
@@ -3,7 +3,7 @@ import tempfile
|
||||
|
||||
import pytest
|
||||
import numpy as np
|
||||
from concretelang import CompilerEngine, library
|
||||
from concrete.compiler import CompilerEngine, library
|
||||
|
||||
KEY_SET_CACHE_PATH = os.path.join(tempfile.gettempdir(), 'KeySetCache')
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import pytest
|
||||
from mlir.ir import Context, RankedTensorType, Location
|
||||
from concretelang import register_dialects
|
||||
from concretelang.dialects import hlfhe
|
||||
from concrete.lang import register_dialects
|
||||
from concrete.lang.dialects import hlfhe
|
||||
|
||||
|
||||
@pytest.mark.parametrize("width", list(range(1, 8)))
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import pytest
|
||||
from concretelang import compiler
|
||||
from concrete import compiler
|
||||
|
||||
|
||||
VALID_INPUTS = [
|
||||
|
||||
Reference in New Issue
Block a user