Skip to content

Commit

Permalink
Merge branch 'develop' into typehints
Browse files Browse the repository at this point in the history
  • Loading branch information
ankona authored Jun 8, 2023
2 parents d857bdd + d4f7df8 commit 0739ee6
Show file tree
Hide file tree
Showing 5 changed files with 583 additions and 189 deletions.
6 changes: 6 additions & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Description

A full list of changes and detailed notes can be found below:

- Remove wait time associated with Experiment launch summary
- Update and rename Redis conf file
- Migrate from redis-py-cluster to redis-py
- Update full test suite to not require a TF wheel at test time
- Update doc strings
Expand All @@ -35,6 +37,8 @@ A full list of changes and detailed notes can be found below:

Detailed notes

- Remove wait time associated with Experiment launch summary (PR298_)
- Update Redis conf file to conform with Redis v7.0.5 conf file (PR293_)
- Migrate from redis-py-cluster to redis-py for cluster status checks (PR292_)
- Update full test suite to no longer require a tensorflow wheel to be available
at test time. (PR291_)
Expand All @@ -51,6 +55,8 @@ argument name is still `interface` for backward compatibility reasons. (PR281_)
- Typehints have been added to public APIs. A makefile target to execute static
analysis with mypy is available `make check-mypy`. (PR295_)

.. _PR298: https://github.com/CrayLabs/SmartSim/pull/298
.. _PR293: https://github.com/CrayLabs/SmartSim/pull/293
.. _PR292: https://github.com/CrayLabs/SmartSim/pull/292
.. _PR291: https://github.com/CrayLabs/SmartSim/pull/291
.. _PR290: https://github.com/CrayLabs/SmartSim/pull/290
Expand Down
8 changes: 4 additions & 4 deletions smartsim/_core/config/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
#
# REDIS_CONF
# - Path to the redis.conf file
# - Default: /SmartSim/smartsim/config/redis6.conf
# - Default: /SmartSim/smartsim/_core/config/redis.conf
#
# REDIS_PATH
# - Path to the redis-server executable
# - Default: /SmartSim/smartsim/bin/redis-server
# - Default: /SmartSim/smartsim/_core/bin/redis-server
#
# REDIS_CLI_PATH
# - Path to the redis-cli executable
# - Default: /SmartSim/smartsim/bin/redis-cli
# - Default: /SmartSim/smartsim/_core/bin/redis-cli
#
# SMARTSIM_LOG_LEVEL
# - Log level for SmartSim
Expand Down Expand Up @@ -93,7 +93,7 @@ def __init__(self):

self.lib_path = Path(dependency_path, "lib").resolve()
self.bin_path = Path(dependency_path, "bin").resolve()
self.conf_path = Path(dependency_path, "config", "redis6.conf")
self.conf_path = Path(dependency_path, "config", "redis.conf")

@property
def redisai(self) -> str:
Expand Down
Loading

0 comments on commit 0739ee6

Please sign in to comment.