Skip to content

Commit

Permalink
update check version and Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
jeanbez committed Apr 26, 2024
1 parent fd46ba3 commit a755fe2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
19 changes: 11 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,28 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y \
automake
RUN rm -rf /var/lib/apt/lists/*

RUN wget ftp://ftp.mcs.anl.gov/pub/darshan/releases/darshan-3.4.0.tar.gz
RUN tar zxvf darshan-3.4.0.tar.gz
RUN wget https://ftp.mcs.anl.gov/pub/darshan/releases/darshan-3.4.4.tar.gz
RUN tar zxvf darshan-3.4.4.tar.gz

WORKDIR /darshan-3.4.0/
WORKDIR /darshan-3.4.4/

RUN bash prepare.sh

WORKDIR /darshan-3.4.0/darshan-util/
WORKDIR /darshan-3.4.4/darshan-util/

RUN ./configure && make && make install
RUN ./configure --prefix=/opt/darshan && make && make install

ENV PATH=/opt/darshan/bin:$PATH
ENV LD_LIBRARY_PATH=/opt/darshan/lib:$LD_LIBRARY_PATH

WORKDIR /

RUN git clone https://github.com/hpc-io/drishti
RUN git clone https://github.com/hpc-io/drishti-io

WORKDIR /drishti
WORKDIR /drishti-io

RUN pip install --upgrade pip
RUN pip install -r requirements.txt
RUN pip install .

ENTRYPOINT ["drishti"]
ENTRYPOINT ["drishti"]
7 changes: 4 additions & 3 deletions drishti/handlers/handle_darshan.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ def check_log_version(console, file, log_version, library_version):

sys.exit(os.EX_DATAERR)

use_file = os.path.abspath(file.replace('.darshan', '.converted.darshan'))
use_file = os.path.basename(file.replace('.darshan', '.converted.darshan'))

console.print(
Panel(
Padding(
'Converting .darshan log from {}: saving output file "{}" in the current working directory.'.format(
'Converting .darshan log from {}: format: saving output file "{}" in the current working directory.'.format(
log_version,
use_file
),
Expand Down Expand Up @@ -85,7 +85,8 @@ def handler():
library_version = darshanll.get_lib_version()

# Make sure log format is of the same version
filename = check_log_version(console, args.log_path, log_version, library_version)
filename = args.log_path
# check_log_version(console, args.log_path, log_version, library_version)

darshanll.log_close(log)

Expand Down

0 comments on commit a755fe2

Please sign in to comment.