Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Xmake cache
.xmake/
build/
python/infinicore/lib/*.so

# MacOS Cache
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion python/infinicore/device.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from . import _infinicore
from infinicore.lib import _infinicore


class device:
Expand Down
2 changes: 1 addition & 1 deletion python/infinicore/dtype.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from . import _infinicore
from infinicore.lib import _infinicore


class dtype:
Expand Down
3 changes: 1 addition & 2 deletions python/infinicore/ops/matmul.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from infinicore.lib import _infinicore
from infinicore.tensor import Tensor

from .. import _infinicore


def matmul(input, other, *, out=None):
if out is None:
Expand Down
3 changes: 1 addition & 2 deletions python/infinicore/ops/rearrange.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from infinicore.lib import _infinicore
from infinicore.tensor import Tensor

from .. import _infinicore


def rearrange(input, other, *, out=None):
if out is None:
Expand Down
3 changes: 1 addition & 2 deletions python/infinicore/tensor.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import infinicore.device
import infinicore.dtype

from . import _infinicore
from infinicore.lib import _infinicore


class Tensor:
Expand Down
11 changes: 0 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import glob
import os
import shutil
import subprocess
from pathlib import Path

from setuptools import setup
from setuptools.command.build import build
Expand All @@ -15,12 +11,5 @@ def run(self):
subprocess.run(["xmake", "build", "-y", "_infinicore"])
subprocess.run(["xmake", "install", "_infinicore"])

installation_dir = os.getenv("INFINI_ROOT", str(Path.home() / ".infini"))
lib_dir = os.path.join(installation_dir, "lib")
lib_path = glob.glob(os.path.join(lib_dir, "_infinicore.*"))[0]
package_dir = os.path.join(self.build_lib, "infinicore")
os.makedirs(package_dir, exist_ok=True)
shutil.move(lib_path, package_dir)


setup(package_dir={"": "python"}, cmdclass={"build": Build})
26 changes: 25 additions & 1 deletion xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,31 @@ target("_infinicore")
add_files("src/infinicore/op/*/*.cc")
add_files("src/infinicore/pybind11/**.cc")

set_installdir(os.getenv("INFINI_ROOT") or (os.getenv(is_host("windows") and "HOMEPATH" or "HOME") .. "/.infini"))
set_installdir("python/infinicore")
target_end()

option("editable")
set_default(false)
set_showmenu(true)
set_description("Install the `infinicore` Python package in editable mode")
option_end()

target("infinicore")
set_kind("phony")

set_default(false)

add_deps("_infinicore")

on_install(function (target)
local pip_install_args = {}

if has_config("editable") then
table.insert(pip_install_args, "--editable")
end

os.execv("python", table.join({"-m", "pip", "install"}, pip_install_args, {"."}))
end)
target_end()

-- Tests
Expand Down