diff --git a/ansible/playbooks/roles/run-hnsw-indexing-transform/files/run-bench.sh b/ansible/playbooks/roles/run-hnsw-indexing-transform/files/run-bench.sh index ebc2206fa..476202352 100755 --- a/ansible/playbooks/roles/run-hnsw-indexing-transform/files/run-bench.sh +++ b/ansible/playbooks/roles/run-hnsw-indexing-transform/files/run-bench.sh @@ -35,23 +35,22 @@ fi cd "${WORK_DIR}" -# Check if venv exists -if [ ! -d "${WORK_DIR}/venv" ]; then - echo "Creating virtual environment..." - python3 -m venv "${WORK_DIR}/venv" - source "${WORK_DIR}/venv/bin/activate" - - echo "Installing requirements..." - pip install -r "${WORK_DIR}/requirements.txt" - - deactivate -else - echo "Virtual environment already exists. Skipping setup." +# Remove existing venv if present +if [ -d "${WORK_DIR}/venv" ]; then + echo "Removing existing virtual environment..." + rm -rf "${WORK_DIR}/venv" fi +# Create and setup virtual environment +echo "Creating virtual environment..." +python3 -m venv "${WORK_DIR}/venv" + echo "Activating virtual environment..." source "${WORK_DIR}/venv/bin/activate" +echo "Installing requirements..." +pip install -r "${WORK_DIR}/requirements.txt" + NOW=$(date "+%Y-%m-%dT%H:%M:%SZ") echo "${NOW}" echo "Running..." diff --git a/ansible/playbooks/roles/run-hnsw-indexing-transform/files/transform.py b/ansible/playbooks/roles/run-hnsw-indexing-transform/files/transform.py index 98a726254..5720340e7 100644 --- a/ansible/playbooks/roles/run-hnsw-indexing-transform/files/transform.py +++ b/ansible/playbooks/roles/run-hnsw-indexing-transform/files/transform.py @@ -37,7 +37,6 @@ TEST_DATA_FILE_2 = DATA_DIR_2 / "tests.jsonl" TEST_DATA_FILE_1 = DATA_DIR / "tests.jsonl" -TOTAL_VECTORS = 100_000 BATCH_SIZE = 500 @@ -176,7 +175,7 @@ def main(): result["initial_precision"] = initial_precision result["precision_before_iteration"] = initial_precision - points_to_migrate = list(range(TOTAL_VECTORS)) + points_to_migrate = list(range(len(vectors_1))) random.shuffle(points_to_migrate) diff --git a/ansible/playbooks/roles/run-hnsw-indexing-update/files/run-bench.sh b/ansible/playbooks/roles/run-hnsw-indexing-update/files/run-bench.sh index 5a8ad7b4e..339e1fbf8 100755 --- a/ansible/playbooks/roles/run-hnsw-indexing-update/files/run-bench.sh +++ b/ansible/playbooks/roles/run-hnsw-indexing-update/files/run-bench.sh @@ -31,23 +31,22 @@ fi cd "${WORK_DIR}" -# Check if venv exists -if [ ! -d "${WORK_DIR}/venv" ]; then - echo "Creating virtual environment..." - python3 -m venv "${WORK_DIR}/venv" - source "${WORK_DIR}/venv/bin/activate" - - echo "Installing requirements..." - pip install -r "${WORK_DIR}/requirements.txt" - - deactivate -else - echo "Virtual environment already exists. Skipping setup." +# Remove existing venv if present +if [ -d "${WORK_DIR}/venv" ]; then + echo "Removing existing virtual environment..." + rm -rf "${WORK_DIR}/venv" fi +# Create and setup virtual environment +echo "Creating virtual environment..." +python3 -m venv "${WORK_DIR}/venv" + echo "Activating virtual environment..." source "${WORK_DIR}/venv/bin/activate" +echo "Installing requirements..." +pip install -r "${WORK_DIR}/requirements.txt" + NOW=$(date "+%Y-%m-%dT%H:%M:%SZ") echo "${NOW}" echo "Running..."