Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove Commands.chpl from tree #3799

Merged
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
2 changes: 1 addition & 1 deletion arkouda-env-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies:
- scipy<=1.13.1
- pytest>=6.0
- pytest-env
# - chapel-py

# Developer dependencies
- pexpect
Expand All @@ -49,4 +50,3 @@ dependencies:
- furo # sphinx theme
- myst-parser
- linkify-it-py

1 change: 1 addition & 0 deletions arkouda-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies:
- scipy<=1.13.1
- pytest>=6.0
- pytest-env
# - chapel-py

- pip:
- typeguard==2.10.0
1 change: 1 addition & 0 deletions pydoc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jupyter
scipy<=1.13.1
pytest>=6.0
pytest-env
# chapel-py

# Developer dependencies
pexpect
Expand Down
20 changes: 20 additions & 0 deletions pydoc/setup/BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ Location: /opt/homebrew/Caskroom/miniforge/base/envs/arkouda/lib/python3.12/site

The `chpl` compiler will be executed with `-I`, `-L` and `-rpath` for each path in your `Makefile.paths`

#### installing the `chapel-py` dependency

Next, the `chpl` compiler's frontend Python bindings (aka `chapel-py`) need to be installed. This is a Python library that gives Arkouda's build system access to the Chapel compiler's frontend, which is used to support Arkouda's command-registration annotations. The library can be installed using the following command:

```
(cd $CHPL_HOME && make chapel-py-venv)
```

This adds `chapel-py` to a Python environment shipped with Chapel. When building Arkouda, that environment will be invoked temporarily to use `chapel-py`. To manually build and install `chapel-py` in your Python or Anaconda environment, see the instructions in the next section.

Note: if the above command fails (potentially due to a stale virtual environment), try running `make clobber` from `$CHPL_HOME/third-party/chpl-venv`, and then rerun the above command.

### Installing Dependencies Manually

*Please Note: This step is to only be performed if you are NOT using dependencies from a conda/pip env. If you attempt to use both, it is possible that version mismatches will cause build failures*.
Expand Down Expand Up @@ -120,6 +132,14 @@ pip install dist/arkouda*.whl
pip install dist/arkouda*.tar.gz
```

#### installing the `chapel-py` dependency manually

To manually install `chapel-py`, navigate to `$CHPL_HOME/tools/chapel-py/`, and:

```
pip install -e .
```

## Build the Server

Run the `make` command to build the `arkouda_server` executable.
Expand Down
1 change: 1 addition & 0 deletions pydoc/setup/REQUIREMENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ The following python packages are required by the Arkouda client package.
- `scipy<=1.13.1`
- `pytest>=6.0`
- `pytest-env`
- `chapel-py` (to be installed manually, as it is shipped with Chapel)

### Developer Specific

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
"tables>=3.8.0",
"pyarrow",
"scipy<=1.13.1",
# chapel-py
],
# List additional groups of dependencies here (e.g. development
# dependencies). Users will be able to install these using the "extras"
Expand Down
1 change: 1 addition & 0 deletions src/registry/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Commands.chpl
3,297 changes: 0 additions & 3,297 deletions src/registry/Commands.chpl

This file was deleted.

4 changes: 2 additions & 2 deletions src/registry/register_commands.bash
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ then
:
else
# if not sucessfull (likely due to mismatched python version), try again with the current python environment
echo "...attempting to use chapel-py bindings from existing environment instead"
if python3 $1/register_commands.py $2 $3 $4;
then
:
else
echo "Unable to register commands; falling back to default 'Commands.chpl' file"
echo "Unable to register commands; make sure 'chapel-py' is installed"
exit 1
fi
fi
Loading